项目搜索增加用户信息搜索
This commit is contained in:
parent
005687442e
commit
64fdfd3b01
|
@ -37,10 +37,11 @@ class Projects::ListQuery < ApplicationQuery
|
||||||
ids = Projects::ElasticsearchService.call(params[:search])
|
ids = Projects::ElasticsearchService.call(params[:search])
|
||||||
items = items.where(platform: 'forge')
|
items = items.where(platform: 'forge')
|
||||||
if ids.present?
|
if ids.present?
|
||||||
items.where(id: ids).by_name_or_identifier(params[:search]).or(Project.visible.where(user_id: User.like(params[:search]).pluck(:id)))
|
items = items.where(id: ids).by_name_or_identifier(params[:search])
|
||||||
else
|
else
|
||||||
items.by_name_or_identifier(params[:search])
|
items = items.by_name_or_identifier(params[:search])
|
||||||
end
|
end
|
||||||
|
items.or(Project.visible.where(user_id: User.like(params[:search]).pluck(:id)))
|
||||||
end
|
end
|
||||||
|
|
||||||
def by_project_type(items)
|
def by_project_type(items)
|
||||||
|
|
Loading…
Reference in New Issue