From 655cc0d2dbcaadaf95ed4dbe56d2a2bdf07a90bb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 22 Jan 2016 20:26:44 +0800
Subject: [PATCH] =?UTF-8?q?issue=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                     | 10 +++++++++-
 app/views/mailer/issue_due_date.text.erb |  0
 lib/tasks/issue_due_date.rake            |  4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 app/views/mailer/issue_due_date.text.erb

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ee37927d3..05b0349ec 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -380,7 +380,15 @@ class Mailer < ActionMailer::Base
   end
 
   # issue截止时间提醒
-  def issue_due_date(issue, recipients)
+  def issue_due_date(issue)
+    recipients ||= []
+    if issue.author.id != issue.assigned_to_id
+      recipients << issue.author.mail
+    end
+
+    # 被指派人邮箱地址加入数组
+    recipients << issue.assigned_to.mail
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
     @author = issue.author
     @issue_name = issue.subject
     @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
diff --git a/app/views/mailer/issue_due_date.text.erb b/app/views/mailer/issue_due_date.text.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/tasks/issue_due_date.rake b/lib/tasks/issue_due_date.rake
index 74ee242f5..8ea6d9ed0 100644
--- a/lib/tasks/issue_due_date.rake
+++ b/lib/tasks/issue_due_date.rake
@@ -14,10 +14,10 @@ namespace :issue_due_date do
         recipients << assigner
         recipients.each do |r|
           issue.forge_messages << ForgeMessage.new(:user_id => r.id, :project_id => issue.project_id, :viewed => false, :status => 1)
-          # issue截止时间邮件提醒
-          Mailer.issue_due_date(issue, recipients).deliver
         end
       end
+      # issue截止时间邮件提醒
+      Mailer.issue_due_date(issue).deliver
     end
   end
 end