Merge branch 'pre_trustie_server' into trustie_server

This commit is contained in:
xxq250 2023-02-13 10:47:42 +08:00
commit 89dc763475
2 changed files with 4 additions and 2 deletions

View File

@ -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'

View File

@ -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