kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds a X-Redmine-Sender header to email notifications (#5643).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8785 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-02-05 12:57:19 +00:00
parent f52f18c281
commit 967f42aa98
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/mailer.rb
View File

@ -41,6 +41,7 @@ class Mailer < ActionMailer::Base
'Issue-Author' => issue.author.login 'Issue-Author' => issue.author.login
redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
message_id issue message_id issue
@author = issue.author
recipients issue.recipients recipients issue.recipients
cc(issue.watcher_recipients - @recipients) cc(issue.watcher_recipients - @recipients)
subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}" subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
@ -394,6 +395,10 @@ class Mailer < ActionMailer::Base
cc.delete(@author.mail) if cc cc.delete(@author.mail) if cc
end end
if @author.logged?
redmine_headers 'Sender' => @author.login
end
notified_users = [recipients, cc].flatten.compact.uniq notified_users = [recipients, cc].flatten.compact.uniq
# Rails would log recipients only, not cc and bcc # Rails would log recipients only, not cc and bcc
mylogger.info "Sending email notification to: #{notified_users.join(', ')}" if mylogger mylogger.info "Sending email notification to: #{notified_users.join(', ')}" if mylogger

8
test/unit/mailer_test.rb
View File

@ -138,6 +138,14 @@ class MailerTest < ActiveSupport::TestCase
assert_equal 'auto-generated', mail.header_string('Auto-Submitted') assert_equal 'auto-generated', mail.header_string('Auto-Submitted')
end end
def test_email_headers_should_include_sender
issue = Issue.find(1)
Mailer.deliver_issue_add(issue)
mail = ActionMailer::Base.deliveries.last
assert_not_nil mail
assert_equal issue.author.login, mail.header_string('X-Redmine-Sender')
end
def test_plain_text_mail def test_plain_text_mail
Setting.plain_text_mail = 1 Setting.plain_text_mail = 1
journal = Journal.find(2) journal = Journal.find(2)