Support multi-group user search

This commit is contained in:
romanrizzi
2019-05-10 12:35:36 -03:00
committed by Guo Xiang Tan
parent 8728850452
commit e7ee556e87
6 changed files with 75 additions and 13 deletions
+5 -3
View File
@@ -843,15 +843,17 @@ class UsersController < ApplicationController
topic_id = topic_id.to_i if topic_id
topic_allowed_users = params[:topic_allowed_users] || false
if params[:group].present?
@group = Group.find_by(name: params[:group])
group_names = params[:groups] || []
group_names << params[:group] if params[:group]
if group_names.present?
@groups = Group.where(name: group_names)
end
results = UserSearch.new(term,
topic_id: topic_id,
topic_allowed_users: topic_allowed_users,
searching_user: current_user,
group: @group
groups: @groups
).search
user_fields = [:username, :upload_avatar_template]