From 69050b427128550d0b9e6db02c8b58f3f1d6f3b3 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 13 Aug 2015 13:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=B4=BE=E7=BB=99=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7=E4=B8=8D=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 11 +++++++---- app/views/layouts/_base_header.html.erb | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index f6faa3eb7..66627c00a 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -141,11 +141,14 @@ class Issue < ActiveRecord::Base end # end - # 发布缺陷foege_messages中添加记录 + # 发布缺陷forge_messages中添加记录 def act_as_forge_message - self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, - :project_id => self.project_id, - :viewed => false) + # 指派给自己的缺陷不提示消息 + 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) + end end diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index 278faae3b..61b1553da 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -37,7 +37,7 @@ {:controller=> 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.host_user}, {:class => 'my-message'} if User.current.logged?%> - + <% end -%>