summaryrefslogtreecommitdiffstats
path: root/app/models/journal.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-02-16 13:19:33 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-02-16 13:19:33 +0000
commit1c8cf4ef8338736ebcaa905f8932545a24e817c6 (patch)
tree1511225a9139cd3f2113c9b908a88c70f4166958 /app/models/journal.rb
parentabb0b15407b33cbe50dc263474631c5bfcf2bd5f (diff)
downloadredmine-1c8cf4ef8338736ebcaa905f8932545a24e817c6.tar.gz
redmine-1c8cf4ef8338736ebcaa905f8932545a24e817c6.zip
Added the following permissions (#527, #585, #627):
* edit_issue_notes: let user edit any notes * edit_own_issue_notes: let user edit his own notes only git-svn-id: http://redmine.rubyforge.org/svn/trunk@1152 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/journal.rb')
-rw-r--r--app/models/journal.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/journal.rb b/app/models/journal.rb
index df7308435..013e2644d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -51,6 +51,7 @@ class Journal < ActiveRecord::Base
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