summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2016-03-01 09:21:19 -0600
committerDrew Blessing <drew@gitlab.com>2016-03-01 13:47:53 -0600
commit9b9abb16549f6c450559d95bc27fb708c31690b6 (patch)
tree94b01c8030a4afc1538612b1162b2395ff37d59e
parentb2f0b3f14582f92f94fe12ca7c2694c213d9bbc4 (diff)
downloadgitlab-ce-9b9abb16549f6c450559d95bc27fb708c31690b6.tar.gz
Only show group member roles if explicitly requested
-rw-r--r--app/views/groups/group_members/_group_member.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml
index a79a0fcdc8e..60234be8f83 100644
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -1,5 +1,6 @@
- user = member.user
- return unless user || member.invite?
+- show_roles = local_assigns.fetch(:show_roles, true)
%li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)}
%span{class: ("list-item-name" if show_controls)}
@@ -28,7 +29,7 @@
= link_to resend_invite_group_group_member_path(@group, member), method: :post, class: "btn-xs btn", title: 'Resend invite' do
Resend invite
- - if should_user_see_group_roles?(current_user, @group)
+ - if show_roles && should_user_see_group_roles?(current_user, @group)
%span.pull-right
%strong.member-access-level= member.human_access
- if show_controls