项目搜索增加组织和用户信息搜索
This commit is contained in:
parent
134a395ffa
commit
0cb6f233f3
|
@ -68,4 +68,9 @@ class Owner < ApplicationRecord
|
|||
has_many :repositories, foreign_key: :user_id, dependent: :destroy
|
||||
has_many :applied_transfer_projects, dependent: :destroy
|
||||
|
||||
scope :like, lambda { |keywords|
|
||||
sql = "CONCAT(lastname, firstname) LIKE :search OR nickname LIKE :search OR login LIKE :search "
|
||||
where(sql, :search => "%#{keywords.strip}%") unless keywords.blank?
|
||||
}
|
||||
|
||||
end
|
||||
|
|
|
@ -41,7 +41,7 @@ class Projects::ListQuery < ApplicationQuery
|
|||
else
|
||||
items = items.by_name_or_identifier(params[:search])
|
||||
end
|
||||
items.or(Project.visible.where(user_id: User.like(params[:search]).pluck(:id)))
|
||||
items.or(Project.visible.where(user_id: Owner.like(params[:search]).pluck(:id)))
|
||||
end
|
||||
|
||||
def by_project_type(items)
|
||||
|
|
Loading…
Reference in New Issue