Browse Source

[FIX]project category correct projects_count

pull/278/head
vilet.yy 5 years ago
parent
commit
2969afd333
3 changed files with 4 additions and 6 deletions
  1. +1
    -3
      app/controllers/project_categories_controller.rb
  2. +1
    -1
      app/models/project.rb
  3. +2
    -2
      app/views/project_categories/group_list.json.jbuilder

+ 1
- 3
app/controllers/project_categories_controller.rb View File

@@ -6,8 +6,6 @@ class ProjectCategoriesController < ApplicationController
end

def group_list
# @project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc)
@project_categories = ProjectCategory.eager_load(:projects)
.where(projects: {is_public: true})
@project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc)
end
end

+ 1
- 1
app/models/project.rb View File

@@ -116,7 +116,7 @@ class Project < ApplicationRecord
scope :no_anomory_projects, -> {where("projects.user_id is not null and projects.user_id != ?", 2)}
scope :recommend, -> { visible.project_statics_select.where(recommend: true) }
scope :secret_and_visible, -> {joins(:license).where("licenses.is_secret = TRUE OR projects.is_public = TRUE")}
scope :secret_and_visible, -> {left_outer_joins(:license).where("licenses.is_secret = TRUE OR projects.is_public = TRUE")}
delegate :is_secret, to: :license, allow_nil: true


+ 2
- 2
app/views/project_categories/group_list.json.jbuilder View File

@@ -1,6 +1,6 @@
json.array! @project_categories do |category|
hidden_projects = category.projects.joins(:license).where(is_public: false, licenses: {is_secret: false})
json.id category.id
json.name category.name
# json.projects_count category.projects_count
json.projects_count category.projects.size
json.projects_count category.projects_count - hidden_projects.size
end

Loading…
Cancel
Save