diff --git a/app/controllers/project_categories_controller.rb b/app/controllers/project_categories_controller.rb index 13f8056d8..d521b2cb1 100644 --- a/app/controllers/project_categories_controller.rb +++ b/app/controllers/project_categories_controller.rb @@ -12,8 +12,7 @@ class ProjectCategoriesController < ApplicationController else projects = Project.visible end - @category_group_list = - projects.joins(:project_category).group(:project_category_id) - .select("project_category_id, count(*) AS projects_count, project_categories.name") + # @category_group_list = projects.joins(:project_category).group(:project_category_id).select("project_category_id, count(*) AS projects_count, project_categories.name") + @category_group_list = projects.joins(:project_category).group("project_categories.name", "project_categories.id").size end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6417e42da..f53a89069 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -46,7 +46,9 @@ class ProjectsController < ApplicationController else projects = Project.visible end - @project_group_list = projects.group(:project_type).select('project_type, count(project_type) AS projects_count').having("count(project_type) > ?", 0) + @project_group_list = projects.group(:project_type).size + + # @project_group_list = projects.group(:project_type).select('project_type, count(project_type) AS projects_count').having("count(project_type) > ?", 0) end def update diff --git a/app/views/project_categories/group_list.json.jbuilder b/app/views/project_categories/group_list.json.jbuilder index 58e6a6c40..14f66c29d 100644 --- a/app/views/project_categories/group_list.json.jbuilder +++ b/app/views/project_categories/group_list.json.jbuilder @@ -1,5 +1,5 @@ -json.array! @category_group_list do |category| - json.id category.project_category_id - json.name category.name - json.projects_count category.projects_count -end +json.array! @category_group_list do |category,v| + json.id category[1] + json.name category[0] + json.projects_count v +end \ No newline at end of file diff --git a/app/views/projects/group_type_list.json.jbuilder b/app/views/projects/group_type_list.json.jbuilder index 218db18a1..34d46894c 100644 --- a/app/views/projects/group_type_list.json.jbuilder +++ b/app/views/projects/group_type_list.json.jbuilder @@ -1,5 +1,5 @@ -json.array! @project_group_list do |group| - json.project_type group.project_type - json.name render_zh_project_type(group.project_type) - json.projects_count group.projects_count -end +json.array! @project_group_list do |type,v| + json.project_type type + json.name render_zh_project_type(type) + json.projects_count v +end \ No newline at end of file