From 77fa0fc4d4c29b94408f7a51cef020fe9e52d01d Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 25 Apr 2021 13:10:21 +0000 Subject: [PATCH] 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 --- app/models/mail_handler.rb | 3 +-- test/unit/mail_handler_test.rb | 6 ++++-- 2 files changed, 5 insertions(+), 4 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 diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index 3c749b329..35ab6e53a 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -1005,9 +1005,11 @@ class MailHandlerTest < ActiveSupport::TestCase end end - def test_reply_to_a_issue_without_permission + def test_reply_to_an_issue_without_permission set_tmp_attachments_directory - Role.all.each {|r| r.remove_permission! :add_issue_notes, :edit_issues} + # "add_issue_notes" permission is explicit required to allow users to add notes + # "edit_issue" permission no longer includes the "add_issue_notes" permission + Role.all.each {|r| r.remove_permission! :add_issue_notes} assert_no_difference 'Issue.count' do assert_no_difference 'Journal.count' do assert_not submit_email('ticket_reply_with_status.eml') -- 2.39.5