From bbd95f6d3a864ef12cb6279f5dd0148e1b3ecbf4 Mon Sep 17 00:00:00 2001 From: Alex Lossent Date: Wed, 3 Aug 2016 18:03:13 +0200 Subject: [PATCH] Always show member role in admin panels Groups using LDAP sync never grant the :admin_group_member ability, causing roles to be hidden to admins as well. --- app/views/admin/groups/show.html.haml | 2 +- app/views/admin/projects/show.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 0611bf7cd9afce..7544f56f680da1 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -110,6 +110,6 @@ .pull-right = link_to icon('pencil-square-o', text: 'Manage Access'), polymorphic_url([@group, :members]), class: "btn btn-xs" %ul.well-list.group-users-list.content-list - = render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false } + = render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false, show_roles: true } .panel-footer = paginate @members, param_name: 'members_page', theme: 'gitlab' diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index b2c607361b3d41..fdb7472ba0b7b3 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -148,7 +148,7 @@ = link_to admin_group_path(@group), class: 'btn btn-xs' do = icon('pencil-square-o', text: 'Manage Access') %ul.well-list.content-list - = render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false } + = render partial: 'shared/members/member', collection: @group_members, as: :member, locals: { show_controls: false, show_roles: true } .panel-footer = paginate @group_members, param_name: 'group_members_page', theme: 'gitlab' @@ -162,6 +162,6 @@ .pull-right = link_to icon('pencil-square-o', text: 'Manage Access'), polymorphic_url([@project, :members]), class: "btn btn-xs" %ul.well-list.project_members.content-list - = render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false } + = render partial: 'shared/members/member', collection: @project_members, as: :member, locals: { show_controls: false, show_roles: true } .panel-footer = paginate @project_members, param_name: 'project_members_page', theme: 'gitlab' -- GitLab