meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00
Code Issues Releases Wiki Activity

Start date and due date in email notifications (#13307).

Browse Source 
Patch by  Senya Senya.


git-svn-id: http://svn.redmine.org/redmine/trunk@17840 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-01-25 08:06:23 +00:00
parent a3e6ae9b35
commit 7ca65bedc0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/issues_helper.rb
View File

@ -321,8 +321,8 @@ module IssuesHelper
def email_issue_attributes(issue, user, html) def email_issue_attributes(issue, user, html)
items = [] items = []
%w(author status priority assigned_to category fixed_version).each do |attribute| %w(author status priority assigned_to category fixed_version start_date due_date).each do |attribute|
unless issue.disabled_core_fields.include?(attribute+"_id") if issue.disabled_core_fields.grep(/^#{attribute}(_id)?$/).empty?
if html if html
items << content_tag('strong', "#{l("field_#{attribute}")}: ") + (issue.send attribute) items << content_tag('strong', "#{l("field_#{attribute}")}: ") + (issue.send attribute)
else else

4
test/unit/mailer_test.rb
View File

@ -378,12 +378,14 @@ class MailerTest < ActiveSupport::TestCase
def test_issue_add_should_not_include_disabled_fields def test_issue_add_should_not_include_disabled_fields
issue = Issue.find(2) issue = Issue.find(2)
tracker = issue.tracker tracker = issue.tracker
tracker.core_fields -= ['fixed_version_id'] tracker.core_fields -= ['fixed_version_id', 'start_date']
tracker.save! tracker.save!
assert Mailer.deliver_issue_add(issue) assert Mailer.deliver_issue_add(issue)
assert_mail_body_no_match 'Target version', last_email assert_mail_body_no_match 'Target version', last_email
assert_mail_body_no_match 'Start date', last_email
assert_select_email do assert_select_email do
assert_select 'li', :text => /Target version/, :count => 0 assert_select 'li', :text => /Target version/, :count => 0
assert_select 'li', :text => /Start date/, :count => 0
end end
end end