过滤条件改为同种类型过滤

app/controllers/users_controller.rb

@@ -126,46 +126,41 @@ class UsersController < ApplicationController
         end
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      # when 'forge_message'
-      when 'forge_message'
+      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
-        @message_alls_count = @message_alls.count
       when 'course_news'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "News", @user).order("created_at desc")
+        # 课程通知包含发布的通知和回复的通知
-        @message_alls_count = @message_alls.count
+        @message_alls = CourseMessage.where("course_message_type =? or course_message_type =?", "News", "Comment").where("user_id =?", @user).order("created_at desc")
       #@user_course_messages_count = @user_course_messages.count
-      when 'forge_news'
+      # when 'forge_news'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
+      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      #   @message_alls_count = @message_alls.count
-      when 'course_news_reply'
+      # when 'course_news_reply'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-      when 'forge_news_reply'
+      # when 'forge_news_reply'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
+      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      #   @message_alls_count = @message_alls.count
-      when 'poll'
+      # when 'poll'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
+      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      #   @message_alls_count = @message_alls.count
-      when 'works_reviewers'
+      # when 'works_reviewers'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
+      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      #   @message_alls_count = @message_alls.count
-      when 'works_reply'
+      # when 'works_reply'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
+      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      #   @message_alls_count = @message_alls.count
       when 'issue'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc")
+        @message_alls = ForgeMessage.where("forge_message_type =? or forge_message_type =?" , "Issue", "Journal").where("user_id=?", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
+      # when 'issue_update' # 缺陷状态更新、留言
-      when 'issue_update' # 缺陷状态更新、留言
+      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
+      #   @message_alls_count = @message_alls.count
-        @message_alls_count = @message_alls.count
       when 'forum'
         @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
       when 'user_feedback'
         @message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
-        @message_alls_count = @message_alls.count
       else
         render_404
         return

app/views/users/user_messages.html.erb

@@ -223,8 +223,12 @@
                          :title => "#{ma.journals_for_message.notes}",
                          :onmouseover =>"message_titile_show('message_title')",
                          :onmouseout => "message_titile_hide('message_title')" %></a>
+                        <div id="message_title" style="display: none" style="margin-top: 0px;">
+                          <%= ma.journals_for_message.notes.html_safe %>
+                        </div>
                       </li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
+
                     </ul>
                 <% end %>
             <% end %>
@@ -243,9 +247,7 @@
 </div>
 
 
-<div id="message_title" style="display: none">
+
- 66666666666666666666666
-</div>
 <script>
     function message_titile_show(message_title)
     {