summaryrefslogtreecommitdiff
path: root/app/controllers/projects/project_members_controller.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-05 14:37:03 +0100
committerPhil Hughes <me@iamphill.com>2016-10-05 14:37:03 +0100
commita0eaff14124b829ccc02df951bd7cb7d3abb7708 (patch)
tree155d91fd044ac3b34a5061d3cd2c8692b0c21ec7 /app/controllers/projects/project_members_controller.rb
parentc2602aaff3f78ad12e1cc06136a7345699951454 (diff)
downloadgitlab-ce-a0eaff14124b829ccc02df951bd7cb7d3abb7708.tar.gz
Updated Ruby variable name
Fixed Ruby code based on review feedback
Diffstat (limited to 'app/controllers/projects/project_members_controller.rb')
-rw-r--r--app/controllers/projects/project_members_controller.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 870dc8abbd4..b2c8656d124 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -5,7 +5,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
def index
- @groups = @project.project_group_links
+ @group_links = @project.project_group_links
@project_members = @project.project_members
@project_members = @project_members.non_invite unless can?(current_user, :admin_project, @project)
@@ -14,9 +14,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
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)
+ @group_links = @project.project_group_links.where(group_id: @project.invited_groups.search(params[:search]).select(:id))
end
@project_members = @project_members.order(access_level: :desc).page(params[:page])
@@ -40,7 +38,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
groups.each do |group|
next unless can?(current_user, :read_group, group)
-
+
project.project_group_links.create(
group: group,
group_access: params[:access_level],