##// END OF EJS Templates
Fixed: CLI-supplied defaults should not be applied when replying to an issue (#7195)....
Jean-Philippe Lang -
r4462:03d4ecbbff99
parent child
Show More
@@ -148,6 +148,9 class MailHandler < ActionMailer::Base
148 raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
148 raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
149 end
149 end
150
150
151 # ignore CLI-supplied defaults for new issues
152 @@handler_options[:issue].clear
153
151 journal = issue.init_journal(user, cleaned_up_text_body)
154 journal = issue.init_journal(user, cleaned_up_text_body)
152 issue.safe_attributes = issue_attributes_from_keywords(issue)
155 issue.safe_attributes = issue_attributes_from_keywords(issue)
153 issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
156 issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
@@ -327,6 +327,14 class MailHandlerTest < ActiveSupport::TestCase
327 assert_equal 1, ActionMailer::Base.deliveries.size
327 assert_equal 1, ActionMailer::Base.deliveries.size
328 end
328 end
329
329
330 def test_add_issue_note_should_not_set_defaults
331 journal = submit_email('ticket_reply.eml', :issue => {:tracker => 'Support request', :priority => 'High'})
332 assert journal.is_a?(Journal)
333 assert_match /This is reply/, journal.notes
334 assert_equal 'Feature request', journal.issue.tracker.name
335 assert_equal 'Normal', journal.issue.priority.name
336 end
337
330 def test_reply_to_a_message
338 def test_reply_to_a_message
331 m = submit_email('message_reply.eml')
339 m = submit_email('message_reply.eml')
332 assert m.is_a?(Message)
340 assert m.is_a?(Message)
General Comments 0
You need to be logged in to leave comments. Login now