From 48ddee478e158e3b42220866d97f588f690f5d76 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 2 Sep 2015 11:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9B=B4=E6=96=B0=E4=B8=BA?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=BB=20=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=B7=B2=E8=AF=BB=E5=92=8C=E6=9C=AA=E8=AF=BB?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/memos_controller.rb           | 19 +++++++++++++++++--
 .../20150831070611_about_memo_message.rb      |  2 +-
 ...50831093918_about_user_feedback_message.rb |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index db212aef7..c78b36666 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -116,9 +116,24 @@ class MemosController < ApplicationController
   REPLIES_PER_PAGE = 20 unless const_defined?(:REPLIES_PER_PAGE)
   def show
     # 更新贴吧帖子留言对应的memo_messages的viewed字段
-    query_memo_messages = @memo.memo_messages
-    pre_count = REPLIES_PER_PAGE
+    unless @memo.children.blank?
+      @memo.children.each do |child|
+        child.memo_messages.each do |memo_message|
+          if User.current.id == memo_message.user_id
+            memo_message.update_attributes(:viewed => true)
+          end
+        end
+      end
+    else
+      query_memo_messages = @memo.memo_messages
+      query_memo_messages.each do |query_memo_message|
+        if User.current.id == query_memo_message.user_id
+          query_memo_message.update_attributes(:viewed => true)
+        end
+      end
+    end
 
+    pre_count = REPLIES_PER_PAGE
     @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示
     @memo.update_column(:viewed_count, (@memo.viewed_count.to_i + 1))
 
diff --git a/db/migrate/20150831070611_about_memo_message.rb b/db/migrate/20150831070611_about_memo_message.rb
index 26551d4a1..fde94d2f9 100644
--- a/db/migrate/20150831070611_about_memo_message.rb
+++ b/db/migrate/20150831070611_about_memo_message.rb
@@ -25,7 +25,7 @@ class AboutMemoMessage < ActiveRecord::Migration
           end
         end
         receivers.each do |r|
-          memo.memo_messages << MemoMessage.new(:user_id => r.id, :forum_id => memo.forum_id, :memo_id => memo.id, :memo_type => "Memo", :viewed => false)
+          memo.memo_messages << MemoMessage.new(:user_id => r.id, :forum_id => memo.forum_id, :memo_id => memo.id, :memo_type => "Memo", :viewed => true)
         end
       end
     end
diff --git a/db/migrate/20150831093918_about_user_feedback_message.rb b/db/migrate/20150831093918_about_user_feedback_message.rb
index 870795966..d021bc3ad 100644
--- a/db/migrate/20150831093918_about_user_feedback_message.rb
+++ b/db/migrate/20150831093918_about_user_feedback_message.rb
@@ -23,7 +23,7 @@ class AboutUserFeedbackMessage < ActiveRecord::Migration
           unless receivers.blank?
             receivers.each do |r|
               puts jour_for_message.id
-              jour_for_message.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => jour_for_message.id, :journals_for_message_type => "Principal", :viewed => false)
+              jour_for_message.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => jour_for_message.id, :journals_for_message_type => "Principal", :viewed => true)
             end
           end
         end