diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 37dbfa3f7..a40a54e95 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -12,9 +12,15 @@ <% unless @user_course_messages_count > 0 %>
  • <%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'} %>
    • <% end %> -
  • <%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'} %>
    • -
  • <%= link_to "发布了课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'} %>
    • -
  • <%= link_to "问卷调查",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'} %>
    • + <% unless @user_course_messages_count > 0 %> +
  • <%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'} %>
    • + <% end %> + <% unless @user_course_messages_count > 0 %> +
  • <%= link_to "发布了课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'} %>
    • + <% end %> + <% unless @user_course_messages_count > 0 %> +
  • <%= link_to "问卷调查",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'} %>
    • + <% end %> <% unless @user_course_messages_count > 0 %>
  • <%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'} %>
    • <% end %> @@ -22,14 +28,24 @@ <% end %> <%# 项目相关消息 %> <% unless @user_forge_messages.nil? %> -
  • <%= 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'} %>
    • + <% unless @user_forge_messages_count > 0 %> +
  • <%= link_to "指派给我",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %>
    • + <% end %> + <% unless @user_forge_messages_count > 0 %> +
  • <%= link_to "更新了问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'} %>
    • + <% end %> + <% unless @user_forge_messages_count > 0 %> +
  • <%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'} %>
    • + <% end %> + <% unless @user_forge_messages_count > 0 %> +
  • <%= link_to "发布了新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'} %>
    • + <% end %> <% end %> <%# 公共贴吧 %> <% unless @user_forum_messages.nil? %> + <% unless @user_memo_messages_count > 0 %>
  • <%= link_to "发布了帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'} %>
    • + <% end %> <% end %> <%# 用户留言 %> @@ -179,9 +195,9 @@ <% end %> <% end %> <% end %> - <% unless @user_forum_messages.nil? %> - <% @user_forum_messages.each do |urm| %> - <% if urm.memo_message_type == "Forum" %> + <% unless @user_memo_messages.nil? %> + <% @user_memo_messages.each do |urm| %> + <% if urm.memo_type == "Memo" %>