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
+ 19
3
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -13,11 +13,17 @@ def users
@@ -13,11 +13,17 @@ def users
# 1: get all groups the current user has access to
# 1: get all groups the current user has access to
groups = GroupsFinder.new(current_user).execute.joins(:users)
groups = GroupsFinder.new(current_user).execute.joins(:users)
# 2: get all users the current user has access to (-> `SearchResults#users`)
# 2: Get the group's whole hierarchy
 
group_users = @group.direct_and_indirect_users
 
 
# 3: get all users the current user has access to (->
 
# `SearchResults#users`), which also applies the query.
users = super
users = super
# 3: filter for users that belong to the previously selected groups
# 4: filter for users that belong to the previously selected groups
users.where(id: groups.select('members.user_id'))
users
 
.where(id: group_users.select('id'))
 
.where(id: groups.select('members.user_id'))
end
end
# rubocop:enable CodeReuse/ActiveRecord
# rubocop:enable CodeReuse/ActiveRecord
end
end
Loading