kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix edit issue notes permission #888

Browse Source
This commit is contained in:
Felix Schäfer 2012-03-02 01:38:03 +01:00 committed by Felix Schäfer
parent 724bd48494
commit 2c76240544
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/issue.rb
View File

@ -707,6 +707,15 @@ class Issue < ActiveRecord::Base
projects projects
end end
# Overrides Redmine::Acts::Journalized::Permissions
#
# The default assumption is that journals have the same permissions
# as the journaled object, issue notes have separate permissions though
def journal_editable_by?(journal, user)
return true if journal.author == user && user.allowed_to?(:edit_own_issue_notes, project)
user.allowed_to? :edit_issue_notes, project
end
private private
def update_nested_set_attributes def update_nested_set_attributes

2
app/models/journal.rb
View File

@ -76,7 +76,7 @@ class Journal < ActiveRecord::Base
end end
def editable_by?(user) def editable_by?(user)
journaled.journal_editable_by?(user) journaled.journal_editable_by?(self, user)
end end
def details def details

2
vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb vendored
View File

@ -22,7 +22,7 @@ module Redmine::Acts::Journalized
module Permissions module Permissions
# Default implementation of journal editing permission # Default implementation of journal editing permission
# Is overridden if defined in the journalized model directly # Is overridden if defined in the journalized model directly
def journal_editable_by?(user) def journal_editable_by?(journal, user)
return true if user.admin? return true if user.admin?
if respond_to? :editable_by? if respond_to? :editable_by?
editable_by? user editable_by? user