From e4ebf6e828a00e2497f50a645c13c17114204a25 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Apr 2020 10:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8F=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=85=AC=E5=BC=80=E7=9A=84=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/project_categories_controller.rb | 13 +++---------- app/controllers/projects_controller.rb | 16 +++------------- app/queries/projects/list_query.rb | 14 ++++---------- 3 files changed, 10 insertions(+), 33 deletions(-) diff --git a/app/controllers/project_categories_controller.rb b/app/controllers/project_categories_controller.rb index 8d3d31780..9a113c449 100644 --- a/app/controllers/project_categories_controller.rb +++ b/app/controllers/project_categories_controller.rb @@ -4,19 +4,12 @@ class ProjectCategoriesController < ApplicationController end def group_list - # is_admin = current_user && current_user&.admin? - # if is_admin - # projects = Project.all - # elsif current_user&.logged? + # if current_user&.logged? # projects = Project.list_user_projects(current_user.id) # else # projects = Project.visible # end - if current_user&.logged? - projects = Project.list_user_projects(current_user.id) - else - projects = Project.visible - end - @category_group_list = projects.no_anomory_projects.joins(:project_category).group("project_categories.id", "project_categories.name").size + projects = Project.no_anomory_projects.visible + @category_group_list = 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 9cca5d46c..618c30571 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -40,23 +40,13 @@ class ProjectsController < ApplicationController end def group_type_list - # is_admin = current_user && current_user&.admin? - # if is_admin - # projects = Project.all - # elsif current_user&.logged? - # + # if current_user&.logged? # projects = Project.list_user_projects(current_user.id) # else # projects = Project.visible # end - # - if current_user&.logged? - projects = Project.list_user_projects(current_user.id) - else - projects = Project.visible - end - # projects = Project.visible - @project_group_list = projects.no_anomory_projects.group(:project_type).size + projects = Project.no_anomory_projects.visible + @project_group_list = projects.group(:project_type).size end def update diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 76e3f308c..f43aa1474 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -10,20 +10,14 @@ class Projects::ListQuery < ApplicationQuery end def call - # if params[:is_admin] - # projects = Project.all - # elsif params[:user_id].to_i != 2 + + # if params[:user_id].to_i != 2 && params[:user_id].to_i != 0 # projects = Project.list_user_projects(params[:user_id]) # else # projects = Project.visible # end - - if params[:user_id].to_i != 2 && params[:user_id].to_i != 0 - projects = Project.list_user_projects(params[:user_id]) - else - projects = Project.visible #匿名用户的项目 - end - scope = projects.no_anomory_projects.includes(:project_category, :project_language, :repository, owner: :user_extension).like(params[:search]) + projects = Project.no_anomory_projects.visible + scope = 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]).distinct