From 7bce3201137d4f14af728111190a241add1afcf0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Feb 2023 16:23:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E4=BB=A3=E7=A0=81=E5=9B=9E=E5=BD=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/projects/list_query.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 076ecddfd..82d612375 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -11,11 +11,7 @@ class Projects::ListQuery < ApplicationQuery end def call - collection = Project.visible - # 增加私有组织中项目过滤 - collection = collection.joins("left join organization_extensions on organization_extensions.organization_id = projects.user_id") - .where("organization_extensions.visibility is null or organization_extensions.visibility in (0,1)") - .where("projects.user_id > 0") + collection = main_collection collection = filter_projects(collection) sort = params[:sort_by] || "updated_on" @@ -56,7 +52,8 @@ class Projects::ListQuery < ApplicationQuery else items = items.by_name_or_identifier(params[:search]) end - items.or(items.where(user_id: Owner.like(params[:search]).pluck(:id))) + items.or(main_collection.where(user_id: Owner.like(params[:search]).pluck(:id))) + end def by_project_type(items) From c0271707a1268561e033aa49fac487c672a45246 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 10 Feb 2023 21:46:24 +0800 Subject: [PATCH 2/3] fixed merge --- app/queries/projects/list_query.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 650be2d9c..82d612375 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -53,6 +53,7 @@ class Projects::ListQuery < ApplicationQuery items = items.by_name_or_identifier(params[:search]) end items.or(main_collection.where(user_id: Owner.like(params[:search]).pluck(:id))) + end def by_project_type(items) From 7d17b654f66ee84d40807ffba67569996e892225 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 13 Feb 2023 10:22:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0gems=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 3 ++- app/queries/projects/list_query.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 4f0f76fcd..0645fa72c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ -source 'https://gems.ruby-china.com' +#source 'https://gems.ruby-china.com' +source 'https://mirrors.cloud.tencent.com/rubygems/' git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'rails', '~> 5.2.0' diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 82d612375..8a8fa2f36 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -48,7 +48,8 @@ class Projects::ListQuery < ApplicationQuery @ids = Projects::ElasticsearchService.call(params[:search]) items = items.where(platform: 'forge') if @ids.present? - items = items.where(id: @ids).by_name_or_identifier(params[:search]) + # items = items.where(id: @ids).by_name_or_identifier(params[:search]) + items = items.where(id: @ids) else items = items.by_name_or_identifier(params[:search]) end