diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-02 15:05:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-08 12:22:55 +0100 |
| commit | f38f57972822137e5c168241eba2d1af33f1c08c (patch) | |
| tree | f53d357b3b553497e8a2f81972158c63e657ac2f | |
| parent | 2c6618b9a4928a64ae876ddc8e58d0b62616a8e2 (diff) | |
| download | gitlab-ce-f38f57972822137e5c168241eba2d1af33f1c08c.tar.gz | |
Merge branch 'add_show_role_boolean_to_group_member_view' into 'master'
Only show group member roles if explicitly requested
This very simply fixes an EE problem, but I made the change here so it's less prone to errors from merges.
In EE, prior to this change, group member roles were shown in project member list when a project is shared with a group. This is bad because the project explicitly shares with the group and sets a 'max access' level. If the max access level is 'developer' the project owner doesn't want to see 'Owner' in the group roles because it will confuse them. I verified that permissions are really being honored here, it was just an error in the view. You can see in https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/views/projects/project_members/_shared_group_members.html.haml#L18 where this was how it was intended to be. Likely a CE-EE merge introduced this bug. That's why I made the boolean required in CE even though this is for EE.
See merge request !3044
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/views/groups/group_members/_group_member.html.haml | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5cc5f77e6ec..f14c613192e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,9 @@ v 8.6.0 (unreleased) - Don't show Issues/MRs from archived projects in Groups view - Increase the notes polling timeout over time (Roberto Dip) +v 8.5.5 + - No changes + v 8.5.4 - Do not cache requests for badges (including builds badge) 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 |