From a9412b959e2b2279be969d268db0ca48758ca30f Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 1 Apr 2016 11:54:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=80=E8=87=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/organizations_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 2af1f1d9e..2c43eec77 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -165,7 +165,8 @@ class OrganizationsController < ApplicationController def get_project_activities_org org project_ids = org.projects.map{|project| project.id}.join(",") unless project_ids.blank? - project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' order by updated_at desc limit 8;") + project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' + and org_act_type in ('Message', 'Issue') order by updated_at desc limit 8;") else project_acts = nil end