diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index af2ebd902..03cdda8ad 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -14,69 +14,69 @@
- <% if @new_message_count >0 %>
- <% unless @user_course_messages.nil? %>
- <% @user_course_messages.each do |ucm| %>
- <% if ucm.course_message_type == "News" %>
-
- - <%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %>
- - "><%= ucm.course_message.author %>
- - ">发布通知
- -
- <%= link_to "#{ucm.course_message.title}", {:controller => 'news', :action => 'show', :id => ucm.course_message.id },:class =>"#{ucm.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
- - <%= time_tag(ucm.course_message.created_on).html_safe %>
-
- <% end %>
- <% if ucm.course_message_type == "HomeworkCommon" %>
-
- <% end %>
- <% if ucm.course_message_type == "Poll" %>
-
- <% end %>
- <% if ucm.course_message_type == "Message" %>
-
- - <%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %>
- - "><%= ucm.course_message.author %>
- <% if ucm.course_message.parent_id.nil? %>
- - ">发布帖子
- -
- <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %>
- - <%= time_tag(ucm.course_message.created_on).html_safe %>
- <% else %>
- - ">回复帖子
- -
- <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %>
- - <%= time_tag(ucm.course_message.created_on).html_safe %>
- <% end %>
-
+ <% if @new_message_count >0 %>
+ <% unless @user_course_messages.nil? %>
+ <% @user_course_messages.each do |ucm| %>
+ <% if ucm.course_message_type == "News" %>
+
+ - <%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %>
+ - "><%= ucm.course_message.author %>
+ - ">发布通知
+ -
+ <%= link_to "#{ucm.course_message.title}", {:controller => 'news', :action => 'show', :id => ucm.course_message.id },:class =>"#{ucm.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+ - <%= time_tag(ucm.course_message.created_on).html_safe %>
+
+ <% end %>
+ <% if ucm.course_message_type == "HomeworkCommon" %>
+
+ <% end %>
+ <% if ucm.course_message_type == "Poll" %>
+
+ <% end %>
+ <% if ucm.course_message_type == "Message" %>
+
+ - <%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %>
+ - "><%= ucm.course_message.author %>
+ <% if ucm.course_message.parent_id.nil? %>
+ - ">发布帖子
+ -
+ <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %>
+ - <%= time_tag(ucm.course_message.created_on).html_safe %>
+ <% else %>
+ - ">回复帖子
+ -
+ <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %>
+ - <%= time_tag(ucm.course_message.created_on).html_safe %>
+ <% end %>
+
+ <% end %>
+
+ <% end %>
<% end %>
-
- <% end %>
- <% end %>
-
- <% unless @user_forge_messages.nil? %>
- <% @user_forge_messages.each do |ufm| %>
+
+ <% unless @user_forge_messages.nil? %>
+ <% @user_forge_messages.each do |ufm| %>
<% if ufm.forge_message_type == "Issue" %>
-
@@ -100,18 +100,19 @@
-
"><%= ufm.forge_message.user %>
- - ">发了留言给我
+ - ">
+ <%= ufm.forge_message.notes.empty? ? "更新了问题状态" : "在问题中留言了" %>
-
- <%= link_to ("#{ufm.forge_message.notes}"), issue_path(:id => ufm.forge_message.journalized_id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+ <%= link_to ("#{ufm.forge_message.notes.empty? ? ufm.forge_message.issue.subject : ufm.forge_message.notes }"), issue_path(:id => ufm.forge_message.journalized_id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
- <%= time_tag(ufm.forge_message.created_on).html_safe %>
<% end %>
+ <% end %>
+ <% end %>
+ <% else %>
+
暂无消息!
<% end %>
- <% end %>
- <% else %>
-
暂无消息!
- <% end %>