From 90c199f15af8308aa78daf468b6b40a3a65825fb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 25 Aug 2015 13:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=9B=B4=E6=96=B0=E5=8C=BA?=
 =?UTF-8?q?=E5=88=AB=E6=96=B0=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb                    | 8 ++------
 app/views/users/user_messages.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1724e3484..ac3817ff8 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -145,18 +145,14 @@ class Issue < ActiveRecord::Base
   def act_as_forge_message
     # 指派给自己的缺陷不提示消息
     unless self.author_id == self.assigned_to_id
-      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id,
-                                              :project_id => self.project_id,
-                                              :viewed => false)
+      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
     end
   end
 
   # 更新缺陷
   def act_as_forge_message_update
     unless self.author_id == self.assigned_to_id
-      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id,
-                                                 :project_id => self.project_id,
-                                                 :viewed => false)
+      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false, :update=> true)
     end
   end
   
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index eacac3c5f..3f355092f 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -133,11 +133,11 @@
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
                           </li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派问题给我</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">与我相关问题</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"}",:title => "#{ma.forge_message.subject}" %></a>
                           </li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ma.forge_message.updated_on).html_safe %> </li>
+                          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                         </ul>
                     <% end %>
                     <% if ma.forge_message_type == "Journal" %>