From 85b90f9958f1d0726ee0d9711d70551f8238be16 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 26 Aug 2015 16:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BB=A3=E7=A0=81=E6=B8=85?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e8d512a2e..cefb6514c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -120,7 +120,7 @@ class UsersController < ApplicationController
       user_querys.update_all(:viewed => true)
       forum_querys.update_all(:viewed => true)
     end
-    @new_message_count = @user.forge_messages.count + @user.memo_messages.count + @user.course_messages.count + @user.user_feedback_messages.count
+    @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil
         @message_alls = []
@@ -128,27 +128,15 @@ class UsersController < ApplicationController
         messages.each do |message_all|
           @message_alls << message_all.message
         end
-
-      # @user_course_messages = MessageAll.where("user_id =? and message_type=?",@user,"CourseMessage").order("created_at desc")
-      # @user_forge_messages = MessageAll.where("user_id =? and message_type=?",@user,"ForgeMessage").order("created_at desc")
-      # @user_memo_messages = MessageAll.where("user_id =? and message_type=?",@user,"MemoMessage").order("created_at desc")
-      # @user_feedback_messages = MessageAll.where("user_id =? and message_type=?",@user,"UserFeedbackMessage").order("created_at desc")
-      # @user_course_messages_count = @user_course_messages.count
-      # @user_forge_messages_count = @user_forge_messages.count
-      # @user_memo_messages_count = @user_memo_messages.count
-      # @user_feedback_messages_count = @user_feedback_messages.count
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_course_messages_count = @user_course_messages.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
-      #@user_course_messages_count = @user_course_messages.count
       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
-      #@user_forge_messages_count = @user_forge_messages.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
@@ -156,42 +144,32 @@ class UsersController < ApplicationController
       when 'forge_news'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_forge_messages_count = @user_forge_messages.count
       when 'course_news_reply'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-      #@user_course_messages_count = @user_course_messages.count
       when 'forge_news_reply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_forge_messagess_count = @user_forge_messages.count
       when 'poll'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_course_messages_count = @user_course_messages.count
       when 'works_reviewers'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_course_messages_count = @user_course_messages.count
       when 'works_reply'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_course_messages_count = @user_course_messages.count
       when 'issue'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_forge_messages_count = @user_forge_messages.count
       when 'issue_update' # 缺陷状态更新、留言
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_forge_messages_count = @user_forge_messages.count
       when 'forum'
         @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
         @message_alls_count = @message_alls.count
-      #@user_memo_messages_count = @user_memo_messages.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
-      #@user_feedback_messages_count = @user_feedback_messages.count
       else
         render_404
         return