jro_apps/redmine Commit - r15238:7918285ac2e6

Enable updating private_notes property on journal edit form (#22575)....

Jean-Philippe Lang -

r15238:7918285ac2e6

parent child

Context file:

r15238:7918285ac2e6

Collapse all files

app/controllers/journals_controller.rb +4 -1

               def update
                 (render_403; return false) unless @journal.editable_by?(User.current)
-                @journal.update_attributes(:notes => params[:notes]) if params[:notes]
+                @journal.notes = params[:notes] if params[:notes]
+                @journal.private_notes = params[:private_notes].present?
+                (render_403; return false) if @journal.private_notes_changed? && User.current.allowed_to?(:set_notes_private, @journal.issue.project) == false
+                @journal.save if @journal.changed?
                 @journal.destroy if @journal.details.empty? && @journal.notes.blank?
                 call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
                 respond_to do |format|

app/helpers/journals_helper.rb +6 0

@@ -58,4 +58,10 module JournalsHelper
58	css_classes << " editable" if editable	58	css_classes << " editable" if editable
59	content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes)	59	content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes)
60	end	60	end
		61
		62	def render_private_notes(journal)
		63	content = journal.private_notes? ? l(:field_is_private) : ''
		64	css_classes = journal.private_notes? ? 'private' : ''
		65	content_tag('span', content.html_safe, :id => "journal-#{journal.id}-private_notes", :class => css_classes)
		66	end
61	end	67	end

app/views/issues/_history.html.erb +1 -1

                 <h4><a href="#note-<%= journal.indice %>" class="journal-link">#<%= journal.indice %></a>
                 <%= avatar(journal.user, :size => "24") %>
                 <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>
-                <%= content_tag('span', l(:field_is_private), :class => 'private') if journal.private_notes? %></h4>
+                <%= render_private_notes(journal) %></h4>
                 <% if journal.details.any? %>
                 <ul class="details">

app/views/journals/_notes_form.html.erb +3 0

                       :id => "journal_#{@journal.id}_notes",
                       :class => 'wiki-edit',
                       :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+                <% if @journal.issue.safe_attribute? 'private_notes' %>
+                  <%= check_box_tag 'private_notes', '1', @journal.private_notes, :id => "journal_#{@journal.id}_private_notes" %> <label for="journal_<%= @journal.id %>_private_notes"><%= l(:field_private_notes) %></label>
+                <% end %>
                 <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
                 <p><%= submit_tag l(:button_save) %>
                 <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @journal.issue),

app/views/journals/update.js.erb +2 0

             <% if @journal.frozen? %>
               $("#change-<%= @journal.id %>").remove();
             <% else %>
+              $("#change-<%= @journal.id %>").attr('class', '<%= @journal.css_classes %>');
               $("#journal-<%= @journal.id %>-notes").replaceWith('<%= escape_javascript(render_notes(@journal.issue, @journal, :reply_links => authorize_for('issues', 'edit'))) %>');
+              $("#journal-<%= @journal.id %>-private_notes").replaceWith('<%= escape_javascript(render_private_notes(@journal)) %>');
               $("#journal-<%= @journal.id %>-notes").show();
               $("#journal-<%= @journal.id %>-form").remove();
             <% end %>

test/functional/journals_controller_test.rb +33 0

@@ -207,6 +207,39 class JournalsControllerTest < ActionController::TestCase
207	assert_include 'journal-2-notes', response.body	207	assert_include 'journal-2-notes', response.body
208	end	208	end
209		209
		210	def test_update_xhr_with_private_notes_checked
		211	@request.session[:user_id] = 1
		212	xhr :post, :update, :id => 2, :private_notes => '1'
		213	assert_response :success
		214	assert_template 'update'
		215	assert_equal 'text/javascript', response.content_type
		216	assert_equal true, Journal.find(2).private_notes
		217	assert_include 'change-2', response.body
		218	assert_include 'journal-2-private_notes', response.body
		219	end
		220
		221	def test_update_xhr_with_private_notes_unchecked
		222	Journal.find(2).update_attributes(:private_notes => true)
		223	@request.session[:user_id] = 1
		224	xhr :post, :update, :id => 2
		225	assert_response :success
		226	assert_template 'update'
		227	assert_equal 'text/javascript', response.content_type
		228	assert_equal false, Journal.find(2).private_notes
		229	assert_include 'change-2', response.body
		230	assert_include 'journal-2-private_notes', response.body
		231	end
		232
		233	def test_update_xhr_with_private_notes_changes_and_without_set_private_notes_permission
		234	@request.session[:user_id] = 2
		235	Role.find(1).add_permission! :edit_issue_notes
		236	Role.find(1).add_permission! :view_private_notes
		237	Role.find(1).remove_permission! :set_notes_private
		238
		239	xhr :post, :update, :id => 2, :private_notes => '1'
		240	assert_response 403
		241	end
		242
210	def test_update_xhr_with_empty_notes_should_delete_the_journal	243	def test_update_xhr_with_empty_notes_should_delete_the_journal
211	@request.session[:user_id] = 1	244	@request.session[:user_id] = 1
212	assert_difference 'Journal.count', -1 do	245	assert_difference 'Journal.count', -1 do

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages