From 90c199f15af8308aa78daf468b6b40a3a65825fb Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 25 Aug 2015 13:51:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8C=BA=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 @@
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
    • -
  • ">指派问题给我
    • +
  • ">与我相关问题
  • <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ma.forge_message.subject}" %>
    • -
  • <%= time_tag(ma.forge_message.updated_on).html_safe %>
    • +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> <% if ma.forge_message_type == "Journal" %> From a83fc1c8d8e88056ec7ffa61d88affd1486b1a91 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 25 Aug 2015 13:52:20 +0800 Subject: [PATCH 2/4] 0 --- app/models/issue.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index ac3817ff8..a63f05e0a 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -152,7 +152,7 @@ class Issue < ActiveRecord::Base # 更新缺陷 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, :update=> true) + self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false) end end From 3170fb2377375891e5489a8d5c27717e6f3d0a51 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 25 Aug 2015 13:56:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 3aed6b5da..34b719b80 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -15,7 +15,7 @@
  • <%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'} %>
  • <%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'} %>
    • <%# 项目相关消息 %> -
  • <%= link_to "指派给我",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %>
    • +
  • <%= link_to "相关问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %>
  • <%= link_to "更新了问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'} %>
  • <%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'} %>
  • <%= link_to "项目新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'} %>
    • From 716ffcfdc9cbf33be61cebf162349c187998ae54 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 25 Aug 2015 14:35:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 34b719b80..2c4bb8b8a 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -229,7 +229,7 @@
  • "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %>
  • - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}".html_safe %> + <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}" %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>