From d6f81c89784a511feffb88b249d47ede86cf3980 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 24 Mar 2016 10:41:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/boards_controller.rb | 31 +++++++---------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index c8518e8a3..a77346d89 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -70,31 +70,16 @@ class BoardsController < ApplicationController
   def show
     # 讨论区消息状态更新（已读和未读）
     if @project
-      query_forge_messages = @board.messages
-      query_forge_messages.each do |query_forge_message|
-        query = query_forge_message.forge_messages
-        query.each do |forge_message|
-          if User.current.id == forge_message.user_id
-            forge_message.update_attributes(:viewed => true)
-          end
-        end
-      end
+      ForgeMessage.where("user_id =? and project_id =? and viewed =?", User.current.id, @project.id, 0).update_all(:viewed => true)
       # 更新@消息为已读
-      @project.boards.each do |board|
-        board.messages.each do |m|
-          User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
-        end
-      end
+      # 注释掉这句是因为和上面的方法代码重复，一个类型的消息，已经更新就不需要再更新
+      # @project.boards.each do |board|
+      #   board.messages.each do |m|
+      #     User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
+      #   end
+      # end
     elsif @course
-      query_course_messages = @board.messages
-      query_course_messages.each do |query_course_message|
-        query = query_course_message.course_messages
-        query.each do |course_message|
-          if User.current.id == course_message.user_id
-            course_message.update_attributes(:viewed => true)
-          end
-        end
-      end
+      CourseMessage.where("user_id =? and course_id =? and viewed =?", User.current.id, @course.id, 0).update_all(:viewed => true)
     end
 
     sort_init 'updated_on', 'desc'