From c7f7f13630a1cbb21a74492310593dc44ef3c4e6 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 21 Apr 2020 11:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=BC=80/=E7=A7=81?= =?UTF-8?q?=E6=9C=89=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 3 +-- app/queries/projects/list_my_query.rb | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c2f107120..cc9d2a63a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -113,10 +113,9 @@ class UsersController < ApplicationController end def projects - scope = Projects::ListMyQuery.call(params.merge(category: params[:category]), current_user) + scope = Projects::ListMyQuery.call(params.merge(category: params[:category],is_public: params[:status]), current_user) @total_count = scope.size @projects = paginate(scope) - end private diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index 23d3bc7d4..685cce62e 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -17,10 +17,11 @@ class Projects::ListMyQuery < ApplicationQuery else projects = Project.where.not(user_id: current_user.id).joins(:members).where(members: { user_id: current_user.id }) end - scope = projects.includes(:members,:issues,:project_category, :project_language, owner: :user_extension).like(params[:search]) - .with_project_type(params[:project_type]) - .with_project_category(params[:category_id]) - .with_project_language(params[:language_id]) + unless params[:is_public].blank? + projects = projects.where(is_public: params[:is_public]) + end + + scope = projects.includes(:members,:issues,:project_category, :project_language, owner: :user_extension) sort = params[:sort_by] || "updated_on" sort_direction = params[:sort_direction] || "desc"