jro_apps/redmine Commit - r1138:1c8cf4ef8338

Added the following permissions (#527, #585, #627):...

Jean-Philippe Lang -

r1138:1c8cf4ef8338

parent child

Context file:

r1138:1c8cf4ef8338

app/controllers/journals_controller.rb +1 -1

               def edit
                 if request.post?
                   @journal.update_attributes(:notes => params[:notes]) if params[:notes]
+                  @journal.destroy if @journal.details.empty? && @journal.notes.blank?
                   respond_to do |format|
                     format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
                     format.js { render :action => 'update' }
                   end
-                  return
                 end
               end

app/helpers/journals_helper.rb +1 -1

               def render_notes(journal, options={})
                 content = ''
                 editable = journal.editable_by?(User.current)
-                if editable
+                if editable && !journal.notes.blank?
                   links = []
                   links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes",
                                                          { :controller => 'journals', :action => 'edit', :id => journal },

app/models/journal.rb +2 -1

               end
               def editable_by?(usr)
-                usr && usr.admin?
+                project = journalized.project
+                usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) || (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))
               end
             end

app/views/issues/_history.rhtml +2 0

             <% note_id = 1 %>
             <% for journal in journals %>
+                <div id="change-<%= journal.id %>">
             	<h4><div style="float:right;"><%= link_to "##{note_id}", :anchor => "note-#{note_id}" %></div>
             	<%= content_tag('a', '', :name => "note-#{note_id}")%>
             	<%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
             	<% end %>
             	</ul>
             	<%= render_notes(journal) unless journal.notes.blank? %>
+            	</div>
               	<% note_id += 1 %>
             <% end %>

app/views/journals/update.rjs +8 -3

@@ -1,3 +1,8
1	page.replace "journal-#{@journal.id}-notes", render_notes(@journal)	1	if @journal.frozen?
2	page.show "journal-#{@journal.id}-notes"	2	# journal was destroyed
3	page.remove "~~journal~~-#{@journal.id}~~-form~~"	3	page.remove "change-#{@journal.id}"
		4	else
		5	page.replace "journal-#{@journal.id}-notes", render_notes(@journal)
		6	page.show "journal-#{@journal.id}-notes"
		7	page.remove "journal-#{@journal.id}-form"
		8	end

lib/redmine.rb +2 0

                 map.permission :edit_issues, {:issues => [:edit, :bulk_edit, :destroy_attachment]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :add_issue_notes, {:issues => :edit}
+                map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
+                map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issues => :move}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries

test/functional/journals_controller_test.rb +8 0

@@ -48,4 +48,12 class JournalsControllerTest < ActionController::TestCase
48	assert_select_rjs :replace, 'journal-2-notes'	48	assert_select_rjs :replace, 'journal-2-notes'
49	assert_equal 'Updated notes', Journal.find(2).notes	49	assert_equal 'Updated notes', Journal.find(2).notes
50	end	50	end
		51
		52	def test_post_edit_with_empty_notes
		53	@request.session[:user_id] = 1
		54	xhr :post, :edit, :id => 2, :notes => ''
		55	assert_response :success
		56	assert_select_rjs :remove, 'change-2'
		57	assert_nil Journal.find_by_id(2)
		58	end
51	end	59	end

General Comments 0

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

No TODOs yet

	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