Merge branch 'develop' into standalone_develop

2023-04-10 15:36:01 +08:00 · 2023-04-10 15:36:01 +08:00 · 6d71e32416
parent e938ce2e25 f81772064d
commit 6d71e32416
1 changed files with 3 additions and 0 deletions
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -44,6 +44,9 @@ class ProjectsController < ApplicationController
        ProjectCategory.sum("projects_count") - Project.visible.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id").where("organization_extensions.visibility =2").count
      elsif params[:search].present?
        @projects.total_count
+      elsif params[:topic_id].present? 
+        topic = ProjectTopic.find_by(id: params[:topic_id])
+        topic&.projects_count || 0
      else
       cate = ProjectCategory.find_by(id: category_id)
       cate&.projects_count || 0