|
|
|
@ -147,8 +147,10 @@ class Mailer < ActionMailer::Base
|
|
|
|
|
@project_url = url_for(:controller => 'projects', :action => 'show', :id => issue.project_id, :token => @token.value)
|
|
|
|
|
|
|
|
|
|
@user_url = url_for(my_account_url(user,:token => @token.value))
|
|
|
|
|
|
|
|
|
|
cc = issue.watcher_recipients - issue.recipients
|
|
|
|
|
cc = nil
|
|
|
|
|
if recipients == issue.recipients[0]
|
|
|
|
|
cc = issue.watcher_recipients - issue.recipients
|
|
|
|
|
end
|
|
|
|
|
subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
|
|
|
|
|
mail(:to => recipients,
|
|
|
|
|
:cc => cc,
|
|
|
|
@ -197,8 +199,11 @@ class Mailer < ActionMailer::Base
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Watchers in cc
|
|
|
|
|
cc = nil
|
|
|
|
|
if recipients == journal.recipients[0]
|
|
|
|
|
cc = journal.watcher_recipients - journal.recipients
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
cc = journal.watcher_recipients - journal.recipients
|
|
|
|
|
s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
|
|
|
|
|
s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
|
|
|
|
|
s << issue.subject
|
|
|
|
|