Skip to content
Snippets Groups Projects

[EE] Add users search results to global search

Merged Jan Provaznik requested to merge ee-users-search-results into master
All threads resolved!
2 files
+ 18
1
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -10,7 +10,14 @@ def initialize(current_user, limit_projects, group, query, default_project_filte
@@ -10,7 +10,14 @@ def initialize(current_user, limit_projects, group, query, default_project_filte
# rubocop:disable CodeReuse/ActiveRecord
# rubocop:disable CodeReuse/ActiveRecord
def users
def users
super.where(id: @group.users_with_descendants)
# 1: get all groups the current user has access to
 
groups = GroupsFinder.new(current_user).execute.joins(:users)
 
 
# 2: get all users the current user has access to (-> `SearchResults#users`)
 
users = super
 
 
# 3: filter for users that belong to the previously selected groups
 
users.where(id: groups.select('members.user_id'))
end
end
# rubocop:enable CodeReuse/ActiveRecord
# rubocop:enable CodeReuse/ActiveRecord
end
end
Loading