From aac80d76c272523a1ee7c9ef751034e955dfab9e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 9 Sep 2016 11:31:57 +0100
Subject: [PATCH] Group links search test fix
---
app/controllers/projects/project_members_controller.rb | 4 ++++
1 file changed, 4 insertions(+)
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')
--
GitLab