diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-09 11:31:57 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-13 08:44:59 +0100 |
| commit | aac80d76c272523a1ee7c9ef751034e955dfab9e (patch) | |
| tree | cd08cad2aa5c64534488bd7ec4733c05b674e012 | |
| parent | b61cd8a3930f194333ea417a03d53a0ad91efa42 (diff) | |
| download | gitlab-ce-aac80d76c272523a1ee7c9ef751034e955dfab9e.tar.gz | |
Group links search test fix
| -rw-r--r-- | app/controllers/projects/project_members_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index 5fd2e77a51a..4d27617608d 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -13,6 +13,10 @@ class Projects::ProjectMembersController < Projects::ApplicationController if params[:search].present? users = @project.users.search(params[:search]).to_a @project_members = @project_members.where(user_id: users) + + group_ids = @groups.pluck(:group_id) + group_ids = Group.where(id: group_ids).search(params[:search]).to_a + @groups = @project.project_group_links.where(group_id: group_ids) end @project_members = @project_members.order('access_level DESC') |