From b754fe70fdca0138ec11b2c537ff5a90652d0b69 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 2 Sep 2016 10:52:17 +0100
Subject: [PATCH] Fixed search
---
.../projects/project_members_controller.rb | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 2175a5d8dcb..7581833eacc 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -10,21 +10,30 @@ class Projects::ProjectMembersController < Projects::ApplicationController
members = []
project_members = @project.project_members
project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
+
+ if params[:search].present?
+ users = @project.users.search(params[:search]).to_a
+ project_members = project_members.where(user_id: users)
+ end
+
members << project_members.pluck(:id)
- if @project.group
- group_members = @project.group.group_members
+ @group = @project.group
+ if @group
+ group_members = @group.group_members
group_members = group_members.non_invite unless can?(current_user, :admin_project, @project)
+
+ if params[:search].present?
+ users = @group.users.search(params[:search]).to_a
+ group_members = group_members.where(user_id: users)
+ end
+
members << group_members.pluck(:id)
end
@project_members = Member.where(id: members)
@project_members_size = @project_members.size
- if params[:search].present?
- @project_members = @project_members.search(params[:search])
- end
-
@project_members = @project_members.page(params[:page])
@requesters = @project.requesters if can?(current_user, :admin_project, @project)
--
GitLab