diff --git a/app/models/mailer.rb b/app/models/mailer.rb index e7a17d4d1..ee37927d3 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -381,7 +381,7 @@ class Mailer < ActionMailer::Base # issue截止时间提醒 def issue_due_date(issue, recipients) - @author = issue.author.login + @author = issue.author @issue_name = issue.subject @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue.id) @subject = "#{l(:mail_issue)}#{issue.subject} #{l(:mail_issue_due_date)} " diff --git a/app/views/mailer/issue_due_date.html.erb b/app/views/mailer/issue_due_date.html.erb index a4fd81236..f0ac2907a 100644 --- a/app/views/mailer/issue_due_date.html.erb +++ b/app/views/mailer/issue_due_date.html.erb @@ -2,7 +2,7 @@ diff --git a/lib/tasks/issue_due_date.rake b/lib/tasks/issue_due_date.rake index 8d101ff94..74ee242f5 100644 --- a/lib/tasks/issue_due_date.rake +++ b/lib/tasks/issue_due_date.rake @@ -8,7 +8,9 @@ namespace :issue_due_date do if ForgeMessage.where("forge_message_type =? and forge_message_id =? and status =?", "Issue", issue.id, 1).first.nil? recipients = [] assigner = User.find(issue.assigned_to_id) - recipients << issue.author + unless assigner.id == issue.author.id + recipients << issue.author + end recipients << assigner recipients.each do |r| issue.forge_messages << ForgeMessage.new(:user_id => r.id, :project_id => issue.project_id, :viewed => false, :status => 1)