diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1724e3484..a63f05e0a 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)
end
end
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index d312a5951..ab44d4983 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'} %>
@@ -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" %>
@@ -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 %>