jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

组织动态添加项目动态

This commit is contained in:
ouyangxuhua 2015-11-14 15:15:54 +08:00
parent 1e1c210939
commit c9a7a94767
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/organizations_controller.rb
View File

@ -60,7 +60,7 @@ class OrganizationsController < ApplicationController
@org_activities_count = OrgActivity.where('container_id =? and container_type =? ', @org_activities_count = OrgActivity.where('container_id =? and container_type =? ',
@organization.id, 'Organization ').order('updated_at desc').count @organization.id, 'Organization ').order('updated_at desc').count
project_ids = @organization.projects.map(&:id) project_ids = @organization.projects.map(&:id)
@org_project_activties = ForgeActivity.where('project_id in (?) and forge_act_type in("Issue","Message","ProjectCreateInfo")',project_ids.join(',')).order("updated_at desc").page(params[:page] || 1).per(10) @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page] || 1).per(10)
@org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count @org_project_activties_count = ForgeActivity.where('project_id in (?)',project_ids.join(',')).count
#@org_activities = paginateHelper @org_activities, 10 #@org_activities = paginateHelper @org_activities, 10
@page = params[:page] @page = params[:page]