From 59bf5cea6ec40553adeb93eb55530c4357bf5626 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 13 Mar 2011 13:24:56 +0000 Subject: [PATCH] Fixed: mail handler keywords are not removed when updating issues (#7785). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5105 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/mail_handler.rb | 3 ++- test/unit/mail_handler_test.rb | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index e509d0918..25643a326 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -155,9 +155,10 @@ class MailHandler < ActionMailer::Base # ignore CLI-supplied defaults for new issues @@handler_options[:issue].clear - journal = issue.init_journal(user, cleaned_up_text_body) + journal = issue.init_journal(user) issue.safe_attributes = issue_attributes_from_keywords(issue) issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)} + journal.notes = cleaned_up_text_body add_attachments(issue) issue.save! logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index a9f7b77da..c4cc8edaa 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -70,6 +70,7 @@ class MailHandlerTest < ActiveSupport::TestCase # keywords should be removed from the email body assert !issue.description.match(/^Project:/i) assert !issue.description.match(/^Status:/i) + assert !issue.description.match(/^Start Date:/i) # Email notification should be sent mail = ActionMailer::Base.deliveries.last assert_not_nil mail @@ -318,6 +319,9 @@ class MailHandlerTest < ActiveSupport::TestCase assert_equal '2010-12-31', issue.due_date.to_s assert_equal User.find_by_login('jsmith'), issue.assigned_to assert_equal "52.6", issue.custom_value_for(CustomField.find_by_name('Float field')).value + # keywords should be removed from the email body + assert !journal.notes.match(/^Status:/i) + assert !journal.notes.match(/^Start Date:/i) end def test_add_issue_note_should_send_email_notification -- 2.39.5