Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/users_controller.rb

@@ -863,7 +863,7 @@ class UsersController < ApplicationController
         when "project_message"
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
         when "current_user"
-          @user_activities = UserActivity.where("user_id = #{User.current.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
         else
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
       end

db/migrate/20150911064528_alter_user_activities.rb

@@ -0,0 +1,26 @@
+class AlterUserActivities < ActiveRecord::Migration
+  def up
+    count = UserActivity.all.count / 30 + 3
+    transaction do
+      for i in 1 ... count do i
+        UserActivity.page(i).per(30).each do |activity|
+          if activity.act_type == 'Message'
+            if activity.act
+              unless activity.act.parent_id.nil?
+                parent_act = UserActivity.where("act_id = #{activity.act.parent.id} and act_type='Message'").first
+                parent_act.created_at = activity.act.parent.children.maximum("created_on")
+                parent_act.save
+                activity.destroy
+              end
+            else
+              activity.destroy
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end