From 59aa1e9c6fc03f8e17bc8c691c7182249e622c4c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 22 Jan 2016 09:55:58 +0800
Subject: [PATCH] =?UTF-8?q?issue=E6=88=AA=E6=AD=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                     | 2 +-
 app/views/mailer/issue_due_date.html.erb | 2 +-
 lib/tasks/issue_due_date.rake            | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

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 @@
   <ul style="list-style-type:none; margin:0; padding:0;">
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-          <p><%=link_to @author, user_url(@author) %> 发布的问题跟踪：<%=link_to @issue_name, @issue_url %> <span style="color: red">截止时间快到了，请您关注！</span></p>
+          <p><%=link_to @author.login, user_url(@author) %> 发布的问题跟踪：<%=link_to @issue_name, @issue_url %> <span style="color: red">截止时间快到了，请您关注！</span></p>
         </span>
     </li>
   </ul>
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)