From b0f48f421e3a3ddb91d015bf5bfb9f2df13fa51a Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 10 Apr 2020 19:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=90=9C=E7=B4=A2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/projects/list_query.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index b5d63e3ab..44848f3f5 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -17,16 +17,16 @@ class Projects::ListQuery < ApplicationQuery # 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.includes(:repository, owner: :user_extension).like(params[:search]) + # 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 + projects = Project.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]) - .includes(:project_category, :project_language, :owner) custom_sort(scope, params[:sort_by], params[:sort_direction]) end