summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-04-25 13:10:21 +0000
committerGo MAEDA <maeda@farend.jp>2021-04-25 13:10:21 +0000
commit77fa0fc4d4c29b94408f7a51cef020fe9e52d01d (patch)
tree00cfb973470630e4eb4df51ed881ee4d694f13c8 /app
parent1d4042d262c46d623b2cc36465552094fe46a312 (diff)
downloadredmine-77fa0fc4d4c29b94408f7a51cef020fe9e52d01d.tar.gz
redmine-77fa0fc4d4c29b94408f7a51cef020fe9e52d01d.zip
Merged r20970 from trunk to 4.1-stable (#35045).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20972 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/mail_handler.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index b29a33d80..b88b1f312 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -225,8 +225,7 @@ class MailHandler < ActionMailer::Base
# check permission
unless handler_options[:no_permission_check]
- unless user.allowed_to?(:add_issue_notes, issue.project) ||
- user.allowed_to?(:edit_issues, issue.project)
+ unless issue.notes_addable?
raise UnauthorizedAction, "not allowed to add notes on issues to project [#{issue.project.name}]"
end
end