From 23993147fbf24e868d33927dc1194b60a106076d Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 1 Sep 2016 14:13:49 +0100
Subject: [PATCH] Fixed issue with groups not displaying
---
.../projects/project_members_controller.rb | 14 --------------
app/views/projects/project_members/index.html.haml | 6 ++----
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index d83e95cf097..6060ddf025b 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -16,20 +16,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
@project_members = @project_members.order('access_level DESC')
- @group = @project.group
-
- if @group
- @group_members = @group.group_members
- @group_members = @group_members.non_invite unless can?(current_user, :admin_group, @group)
-
- if params[:search].present?
- users = @group.users.search(params[:search]).to_a
- @group_members = @group_members.where(user_id: users)
- end
-
- @group_members = @group_members.order('access_level DESC')
- end
-
@requesters = @project.requesters if can?(current_user, :admin_project, @project)
@project_member = @project.project_members.new
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index db8a060d170..42a23057ff1 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -21,9 +21,7 @@
.form-group
= search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
= icon("search")
- - if @grups
+ - if @groups.size > 0
= render 'groups', groups: @groups
- = render 'team', members: @project_members
- - if @group
- = render "group_members", members: @group_members
+ = render 'team', members: @project_members
--
GitLab