Skip to content
Snippets Groups Projects
Commit 2abbb098 authored by Phil Hughes's avatar Phil Hughes
Browse files

Removed group members from the list for now

parent d8fee09e
No related branches found
No related tags found
1 merge request!6148Project members UI
Loading
@@ -10,33 +10,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
Loading
@@ -10,33 +10,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
project_members = @project.project_members project_members = @project.project_members
project_members = project_members.non_invite unless can?(current_user, :admin_project, @project) project_members = project_members.non_invite unless can?(current_user, :admin_project, @project)
   
group = @project.group
if group
group_members = group.group_members
group_members = group_members.non_invite unless can?(current_user, :admin_project, @project)
end
if params[:search].present?
groups_id = @groups.pluck(:group_id)
groups = Group.where(id: groups_id).search(params[:search]).to_a
@groups = @project.project_group_links.where(group_id: groups)
users = @project.users.search(params[:search]).to_a
project_members = project_members.where(user_id: users)
if group_members
users = group.users.search(params[:search]).to_a
group_members = group_members.where(user_id: users)
end
end
members_ids = project_members.pluck(:id) members_ids = project_members.pluck(:id)
   
if group_members
members_ids << group_members.pluck(:id)
end
@members = Member.where(id: members_ids.flatten) @members = Member.where(id: members_ids.flatten)
@members_size = @members.size @members_size = @members.size
   
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment