From c0271707a1268561e033aa49fac487c672a45246 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 10 Feb 2023 21:46:24 +0800 Subject: [PATCH 1/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 2/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 From f0c1e9e31940d2efed2d201e900c52f9e6dc63a1 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 13 Feb 2023 11:27:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=90=8C=E6=AD=A5es=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/projects/list_query.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 8a8fa2f36..6b0843540 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -51,10 +51,9 @@ class Projects::ListQuery < ApplicationQuery # 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]) + items = items.by_name_or_identifier(params[:search]).or(main_collection.where(user_id: Owner.like(params[:search]).pluck(:id))) end - items.or(main_collection.where(user_id: Owner.like(params[:search]).pluck(:id))) - + items end def by_project_type(items)