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 -%>