From 3b3ad254f1c5796cd2b333ab7f153848b176af2e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 26 Mar 2020 09:39:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E5=88=86=E7=B1=BB=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/project_categories_controller.rb | 5 ++--- app/controllers/projects_controller.rb | 4 +++- app/views/project_categories/group_list.json.jbuilder | 10 +++++----- app/views/projects/group_type_list.json.jbuilder | 10 +++++----- 4 files changed, 15 insertions(+), 14 deletions(-) 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