From 79c106a1c6bd5f0e3d9e698304749d58a0315f16 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 31 May 2016 11:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/apis/activities.rb    | 20 ++------------------
 public/assets/wechat/activities.html |  2 +-
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb
index 2275a550e..af17e0f44 100644
--- a/app/api/mobile/apis/activities.rb
+++ b/app/api/mobile/apis/activities.rb
@@ -13,28 +13,12 @@ module Mobile
         end
         post do
           user = UserWechat.find_by_openid(params[:openid]).user
-=begin
-          shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
-          shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
-          page = params[:page] ? params[:page] : 0
-          user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
-          user_course_ids = (user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
-          course_types = "('Message','News','HomeworkCommon','Poll','Course')"
-          project_types = "('Message','Issue','ProjectCreateInfo')"
-          principal_types = "JournalsForMessage"
-
-          blog_ids = "("+user.blog.id.to_s+","+((User.watched_by(user.id).count == 0 )? '0' :User.watched_by(user.id).map{|u| u.blog.id}.join(','))+")"
-          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}) "+
-                                              "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{user.id}) " +
-                                              "or (container_type = 'Blog' and act_type= 'BlogComment' and container_id in #{blog_ids})").order('updated_at desc')
-=end
 
           shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id)
           shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id)
           page = params[:page] ? params[:page] : 0
-          user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
-          user_course_ids = (user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
+          user_project_ids = (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.where("status = 1").map{|project| project.id}-shield_project_ids).join(",") + ")"
+          user_course_ids = (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")"
           course_types = "('Message','News','HomeworkCommon','Poll','Course')"
           project_types = "('Message','Issue','Project')"
           principal_types = "JournalsForMessage"
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 1bab8dfb4..30b4dafaa 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -175,7 +175,7 @@
           </div>
         </div>
 
-        <div ng-if="act.act_type=='ProjectCreateInfo'">
+        <div ng-if="act.act_type=='Project'">
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">