From 2b24bc97241c9719c5127ccd87c11b3b81841f5c Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Apr 2020 09:19:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/project_categories_controller.rb | 4 ++-- app/controllers/projects_controller.rb | 4 ++-- app/models/project.rb | 2 +- app/queries/projects/list_query.rb | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/project_categories_controller.rb b/app/controllers/project_categories_controller.rb index 7641d54c4..8d3d31780 100644 --- a/app/controllers/project_categories_controller.rb +++ b/app/controllers/project_categories_controller.rb @@ -15,8 +15,8 @@ class ProjectCategoriesController < ApplicationController if current_user&.logged? projects = Project.list_user_projects(current_user.id) else - projects = Project.no_anomory_projects.visible + projects = Project.visible end - @category_group_list = projects.joins(:project_category).group("project_categories.id", "project_categories.name").size + @category_group_list = projects.no_anomory_projects.joins(:project_category).group("project_categories.id", "project_categories.name").size end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 1fb9290e8..46c8ff64e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -51,10 +51,10 @@ class ProjectsController < ApplicationController if current_user&.logged? projects = Project.list_user_projects(current_user.id) else - projects = Project.no_anomory_projects.visible + projects = Project.visible end # projects = Project.visible - @project_group_list = projects.group(:project_type).size + @project_group_list = projects.no_anomory_projects.group(:project_type).size end def update diff --git a/app/models/project.rb b/app/models/project.rb index e5d01eba7..1f047eb11 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -105,7 +105,7 @@ class Project < ApplicationRecord user_not_show_1 = projects.where("user_id != ?",user_id).pluck(:id).uniq user_show_2 = projects.joins(:members).where("members.user_id = ?", user_id).pluck(:id).uniq - Project.no_anomory_projects.where.not(id: (user_not_show_1 - user_show_2).uniq) + Project.where.not(id: (user_not_show_1 - user_show_2).uniq) end def members_count diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 8c9196388..1e00ac452 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -21,9 +21,9 @@ class Projects::ListQuery < ApplicationQuery if params[:user_id].to_i != 2 && params[:user_id].to_i != 0 projects = Project.list_user_projects(params[:user_id]) else - projects = Project.no_anomory_projects.visible #匿名用户的项目 + projects = Project.visible #匿名用户的项目 end - scope = projects.includes(:project_category, :project_language, :repository, owner: :user_extension).like(params[:search]) + scope = projects.no_anomory_projects.includes(:project_category, :project_language, :repository, owner: :user_extension).like(params[:search]) .with_project_type(params[:project_type]) .with_project_category(params[:category_id]) .with_project_language(params[:language_id])