@@ -40,6 +40,7 class Mailer < ActionMailer::Base | |||||
40 | 'Issue-Id' => issue.id, |
|
40 | 'Issue-Id' => issue.id, | |
41 | 'Issue-Author' => issue.author.login |
|
41 | 'Issue-Author' => issue.author.login | |
42 | redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to |
|
42 | redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to | |
|
43 | @author = journal.user | |||
43 | recipients issue.recipients |
|
44 | recipients issue.recipients | |
44 | # Watchers in cc |
|
45 | # Watchers in cc | |
45 | cc(issue.watcher_recipients - @recipients) |
|
46 | cc(issue.watcher_recipients - @recipients) | |
@@ -209,9 +210,10 class Mailer < ActionMailer::Base | |||||
209 | def create_mail |
|
210 | def create_mail | |
210 | # Removes the current user from the recipients and cc |
|
211 | # Removes the current user from the recipients and cc | |
211 | # if he doesn't want to receive notifications about what he does |
|
212 | # if he doesn't want to receive notifications about what he does | |
212 | if User.current.pref[:no_self_notified] |
|
213 | @author ||= User.current | |
213 | recipients.delete(User.current.mail) if recipients |
|
214 | if @author.pref[:no_self_notified] | |
214 | cc.delete(User.current.mail) if cc |
|
215 | recipients.delete(@author.mail) if recipients | |
|
216 | cc.delete(@author.mail) if cc | |||
215 | end |
|
217 | end | |
216 | # Blind carbon copy recipients |
|
218 | # Blind carbon copy recipients | |
217 | if Setting.bcc_recipients? |
|
219 | if Setting.bcc_recipients? |
General Comments 0
You need to be logged in to leave comments.
Login now