From 3f690fd9a01fc67fd9b8f4d7eebeafbf1d0d9b46 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Oct 2021 11:00:32 +0800
Subject: [PATCH] add: pinned projects size

---
 app/controllers/admins/project_categories_controller.rb | 2 +-
 app/views/admins/project_categories/_list.html.erb      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admins/project_categories_controller.rb b/app/controllers/admins/project_categories_controller.rb
index 8b1dd1f77..3b5065a16 100644
--- a/app/controllers/admins/project_categories_controller.rb
+++ b/app/controllers/admins/project_categories_controller.rb
@@ -5,7 +5,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController
   def index 
     sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
     sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
-    q = ProjectCategory.ransack(name_cont: params[:name])
+    q = ProjectCategory.includes(:projects).ransack(name_cont: params[:name])
     project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_categories = paginate(project_categories)
     
diff --git a/app/views/admins/project_categories/_list.html.erb b/app/views/admins/project_categories/_list.html.erb
index b8b55afa4..1a460a486 100644
--- a/app/views/admins/project_categories/_list.html.erb
+++ b/app/views/admins/project_categories/_list.html.erb
@@ -5,6 +5,7 @@
     <th width="30%">名称</th>
     <th width="20%"><%= sort_tag('精选', name: 'pinned_index', path: admins_project_categories_path) %></th>
     <th width="20%"><%= sort_tag('项目数', name: 'projects_count', path: admins_project_categories_path) %></th>
+    <th width="20%">精选项目数</th>
     <th width="20%"><%= sort_tag('创建时间', name: 'created_at', path: admins_project_categories_path) %></th>
     <th width="25%">操作</th>
   </tr>
@@ -19,6 +20,7 @@
         </td>
         <td><%= project_category.pinned_index == 0 ? "" : "√" %></td>
         <td><%= project_category.projects_count %></td>
+        <td><%= project_category.projects.where(is_pinned: true).size %></td>
         <td><%= project_category.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
         <td class="action-container">
         <%= link_to "编辑", edit_admins_project_category_path(project_category), remote: true, class: "action" %>