diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-01-25 08:06:23 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-01-25 08:06:23 +0000 |
| commit | 7ca65bedc03f6e2ed367afb83152bf27e9065284 (patch) | |
| tree | 066afe31d8e7c3549ccb850ffe4e68f65630dc46 | |
| parent | a3e6ae9b3596b3705a918dba25579773c1549092 (diff) | |
| download | redmine-7ca65bedc03f6e2ed367afb83152bf27e9065284.tar.gz redmine-7ca65bedc03f6e2ed367afb83152bf27e9065284.zip | |
Start date and due date in email notifications (#13307).
Patch by Senya Senya.
git-svn-id: http://svn.redmine.org/redmine/trunk@17840 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/issues_helper.rb | 4 | ||||
| -rw-r--r-- | test/unit/mailer_test.rb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 66d3e1f3e..14d43f98e 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -321,8 +321,8 @@ module IssuesHelper def email_issue_attributes(issue, user, html) items = [] - %w(author status priority assigned_to category fixed_version).each do |attribute| - unless issue.disabled_core_fields.include?(attribute+"_id") + %w(author status priority assigned_to category fixed_version start_date due_date).each do |attribute| + if issue.disabled_core_fields.grep(/^#{attribute}(_id)?$/).empty? if html items << content_tag('strong', "#{l("field_#{attribute}")}: ") + (issue.send attribute) else diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index d61479202..37e41e87b 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -378,12 +378,14 @@ class MailerTest < ActiveSupport::TestCase def test_issue_add_should_not_include_disabled_fields issue = Issue.find(2) tracker = issue.tracker - tracker.core_fields -= ['fixed_version_id'] + tracker.core_fields -= ['fixed_version_id', 'start_date'] tracker.save! assert Mailer.deliver_issue_add(issue) assert_mail_body_no_match 'Target version', last_email + assert_mail_body_no_match 'Start date', last_email assert_select_email do assert_select 'li', :text => /Target version/, :count => 0 + assert_select 'li', :text => /Start date/, :count => 0 end end |