diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-29 17:38:57 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-12-29 17:38:57 +0000 |
| commit | 03d4ecbbff99492cf96695a87d39ce20c0692a4f (patch) | |
| tree | 7310b8da7dfb138e0a1b36eb8262acde82d9ff3f | |
| parent | 21c0b868ae1d7836dcfe34ac0ad740df981e304d (diff) | |
| download | redmine-03d4ecbbff99492cf96695a87d39ce20c0692a4f.tar.gz redmine-03d4ecbbff99492cf96695a87d39ce20c0692a4f.zip | |
Fixed: CLI-supplied defaults should not be applied when replying to an issue (#7195).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4576 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/mail_handler.rb | 3 | ||||
| -rw-r--r-- | test/unit/mail_handler_test.rb | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 4b6b4a402..617f0ee11 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -148,6 +148,9 @@ class MailHandler < ActionMailer::Base raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project) end + # ignore CLI-supplied defaults for new issues + @@handler_options[:issue].clear + journal = issue.init_journal(user, cleaned_up_text_body) issue.safe_attributes = issue_attributes_from_keywords(issue) issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)} diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index df22bddc8..a9f7b77da 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -327,6 +327,14 @@ class MailHandlerTest < ActiveSupport::TestCase assert_equal 1, ActionMailer::Base.deliveries.size end + def test_add_issue_note_should_not_set_defaults + journal = submit_email('ticket_reply.eml', :issue => {:tracker => 'Support request', :priority => 'High'}) + assert journal.is_a?(Journal) + assert_match /This is reply/, journal.notes + assert_equal 'Feature request', journal.issue.tracker.name + assert_equal 'Normal', journal.issue.priority.name + end + def test_reply_to_a_message m = submit_email('message_reply.eml') assert m.is_a?(Message) |