From a8b7d1b81f427b91c90ea0ac7d6843ace32712ea Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 7 Dec 2015 17:11:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=A1=B9=E7=9B=AE=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84message,=E4=B8=8D=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=8A=E7=BB=84=E7=BB=87=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/forge_activity.rb | 26 +++++++++++++++-----------
 app/models/message.rb        |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/models/forge_activity.rb b/app/models/forge_activity.rb
index 115575289..c98c5475b 100644
--- a/app/models/forge_activity.rb
+++ b/app/models/forge_activity.rb
@@ -46,20 +46,24 @@ class ForgeActivity < ActiveRecord::Base
   end
 
   def add_org_activity
-    if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
-      org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first
-      if org_activity
+    org_activity = OrgActivity.where("org_act_type = '#{self.forge_act_type.to_s}' and org_act_id = #{self.forge_act_id}").first
+    if org_activity
+      org_activity.created_at = self.created_at
+      org_activity.save
+    else
+      if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
+        org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first
         org_activity.created_at = self.created_at
         org_activity.save
+      else
+        OrgActivity.create(:user_id => self.user_id,
+                           :org_act_id => self.forge_act_id,
+                           :org_act_type => self.forge_act_type,
+                           :container_id => self.project_id,
+                           :container_type => 'Project',
+                           :created_at => self.created_at,
+                           :updated_at => self.updated_at)
       end
-    else
-      OrgActivity.create(:user_id => self.user_id,
-                       :org_act_id => self.forge_act_id,
-                       :org_act_type => self.forge_act_type,
-                       :container_id => self.project_id,
-                       :container_type => 'Project',
-                       :created_at => self.created_at,
-                       :updated_at => self.updated_at)
     end
   end
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 92ec0235e..d8f62171a 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -186,7 +186,7 @@ class Message < ActiveRecord::Base
   # Description 
   def act_as_forge_activity
     # 如果project为空，那么就是课程相关的消息
-    if !self.board.project.nil?
+    if !self.board.project.nil? && self.parent_id.nil?
       self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                              :project_id => self.board.project.id)
     end