floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-24 05:35:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into pre_trustie_server

Browse Source
This commit is contained in:
“xxq250”
2022-11-01 17:53:40 +08:00
parent 7d3a745f25 2618dc5798
commit ccaae183b1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ class Projects::ListQuery < ApplicationQuery
end end
def call def call
collection = Project.all collection = Project.visible
collection = filter_projects(collection) collection = filter_projects(collection)
sort = params[:sort_by] || "updated_on" sort = params[:sort_by] || "updated_on"
@@ -35,9 +35,9 @@ class Projects::ListQuery < ApplicationQuery
def by_search(items) def by_search(items)
ids = Projects::ElasticsearchService.call(params[:search]) ids = Projects::ElasticsearchService.call(params[:search])
if ids.present? if ids.present?
items.visible.where(id: ids).by_name_or_identifier(params[:search]) items.where(id: ids).by_name_or_identifier(params[:search])
else else
items.visible.by_name_or_identifier(params[:search]) items.by_name_or_identifier(params[:search])
end end
end end