From 769a4a1bcfee4ed8323e1855ca611198e90d744d Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Sep 2015 10:15:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0issue=E6=88=AA=E6=AD=A2?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=8F=90=E9=86=92=E6=B6=88=E6=81=AF=EF=BC=9B?=
 =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=BA=94rake=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_forge.html.erb | 70 ++++++++++++++------
 lib/tasks/issue_due_date.rake                |  2 -
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index fcd4ba30a..641fb9269 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -56,28 +56,54 @@
         </ul>
     <% end %>
     <% if ma.forge_message_type == "Issue" %>
-        <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
-          </li>
-          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                        :onmouseover => "message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></a>
-          </li>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
-            <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
-                <div class="fl"><strong>描述：</strong></div>
-                <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+        <% if ma.status == 1%>
+            <ul class="homepageNewsList fl">
+              <li class="homepageNewsPortrait fl">
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+              </li>
+              <li class="homepageNewsPubType fl">
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布的周报：":"指派给你的问题："%></span>
+              </li>
+              <li class="homepageHomeworkContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
+                    <div class="fl"><strong>描述：</strong></div>
+                    <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
+                <% end %>
+              </div>
+              <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% else %>
+            <ul class="homepageNewsList fl">
+              <li class="homepageNewsPortrait fl">
+                <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
+              </li>
+              <li class="homepageNewsPubType fl">
+                <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"><%= ma.forge_message.tracker_id == 5 ? "发布了周报：":"指派了问题给你："%></span>
+              </li>
+              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            :onmouseover => "message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %></a>
+              </li>
+              <div style="display: none" class="message_title_red system_message_style">
+                <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
+                    <div class="fl"><strong>描述：</strong></div>
+                    <div class="ml36"><%= ma.forge_message.description.html_safe %></div>
+                <% end %>
+              </div>
+              <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            </ul>
+        <% end %>
     <% end %>
     <% if ma.forge_message_type == "Journal" %>
         <ul class="homepageNewsList fl">
diff --git a/lib/tasks/issue_due_date.rake b/lib/tasks/issue_due_date.rake
index bf5566789..f40fa290f 100644
--- a/lib/tasks/issue_due_date.rake
+++ b/lib/tasks/issue_due_date.rake
@@ -4,14 +4,12 @@ namespace :issue_due_date do
   task :end_time => :environment do
     contrast_time = Time.now - 86400
     issues = Issue.where("due_date >=? and due_date <=?",contrast_time,Time.now)
-    puts issues
     issues.each do |issue|
       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
         recipients << assigner
-        puts recipients
         recipients.each do |r|
           issue.forge_messages << ForgeMessage.new(:user_id => r.id, :project_id => issue.project_id, :viewed => false, :status => 1)
           # 发送邮件通知