消息显示内容修改

app/controllers/users_controller.rb

@@ -128,13 +128,13 @@ class UsersController < ApplicationController
       # when 'system_messages'
       #   @message_alls = SystemMessage.order("created_at desc").all
       when 'apply'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
+        @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject') and user_id =?", @user).order("created_at desc")
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-      # when 'forge_message'
-      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+      when 'forge_message'
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
       #   @message_alls_count = @message_alls.count
       when 'course_news'
         # 课程通知包含发布的通知和回复的通知

app/views/users/user_messages.html.erb

@@ -5,7 +5,7 @@
       <ul class="newsType">
         <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
         <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
-        <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
+        <li><%= link_to "加入项目", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
         <%# 课程相关消息 %>
         <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
         <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
@@ -17,7 +17,7 @@
         <%# 项目相关消息 %>
         <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
         <!--<li><%#= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>-->
+        <li><%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
         <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
         <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
         <%# 项目相关消息 %>