floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop

This commit is contained in:
yystopf 2023-02-15 11:31:02 +08:00
parent 202be8246b f0c1e9e319
commit c38a4e4e08
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
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'

8
app/queries/projects/list_query.rb
View File

@ -48,12 +48,12 @@ 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])
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)