From 774b00f2d446f96e0bdcf00d79c5ccfa206eb391 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 29 Sep 2015 11:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20150925025200_alter_activities.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/migrate/20150925025200_alter_activities.rb b/db/migrate/20150925025200_alter_activities.rb
index 638918e8e..8a5480617 100644
--- a/db/migrate/20150925025200_alter_activities.rb
+++ b/db/migrate/20150925025200_alter_activities.rb
@@ -4,7 +4,7 @@ class AlterActivities < ActiveRecord::Migration
       if activity.act_type == 'JournalsForMessage'
         if activity.act
           unless activity.act.m_parent_id.nil?
-            parent_act = UserActivity.where("act_id = #{activity.act.parent.id} and act_type='JournalsForMessage' and container_type='Course'").first
+            parent_act = UserActivity.where("act_id = #{activity.act.m_parent_id} and act_type='JournalsForMessage' and container_type='Course'").first
             if parent_act
               parent_act.created_at = activity.act.parent.children.maximum("created_on")
               parent_act.save
@@ -21,7 +21,7 @@ class AlterActivities < ActiveRecord::Migration
         if activity.course_act_type == 'JournalsForMessage'
           if activity.course_act
             unless activity.course_act.m_parent_id.nil?
-              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.parent.id} and course_act_type='JournalsForMessage'").first
+              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.m_parent_id} and course_act_type='JournalsForMessage'").first
               if parent_act
                 parent_act.created_at = activity.course_act.parent.children.maximum("created_on")
                 parent_act.save
@@ -34,7 +34,7 @@ class AlterActivities < ActiveRecord::Migration
         elsif activity.course_act_type == 'Message'
           if activity.course_act
             unless activity.course_act.parent_id.nil?
-              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.parent.id} and course_act_type='Message'").first
+              parent_act = CourseActivity.where("course_act_id = #{activity.course_act.parent_id} and course_act_type='Message'").first
               if parent_act
                 parent_act.created_at = activity.course_act.parent.children.maximum("created_on")
                 parent_act.save