diff options
| author | Phil Hughes <me@iamphill.com> | 2016-09-02 15:10:22 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-09-13 08:44:59 +0100 |
| commit | 2c3fa33ca2e75792d1027eb73e2f69fed67bc435 (patch) | |
| tree | a3847dd541e7133ce5f6f4cf61a7023251b70bb2 /app/views/shared/members | |
| parent | ccf76831da422298242ce3d8d11f72ab50454c85 (diff) | |
| download | gitlab-ce-2c3fa33ca2e75792d1027eb73e2f69fed67bc435.tar.gz | |
Updated some specs
Fixed issue with group name not showing
Diffstat (limited to 'app/views/shared/members')
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 2f98eeff658..6f8c3c4da2e 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -1,6 +1,7 @@ - show_roles = local_assigns.fetch(:show_roles, true) - show_controls = local_assigns.fetch(:show_controls, true) - user = local_assigns.fetch(:user, member.user) +- source = member.source %li.member{ class: dom_class(member), id: dom_id(member) } %span{ class: ("list-item-name" if show_controls) } @@ -17,9 +18,9 @@ %label.label.label-danger %strong Blocked - - if member.respond_to?(:group) && !@group - = link_to member.group, class: "member-group-link prepend-left-5" do - = "· #{member.group.name}" + - if source.instance_of?(Group) && !@group + = link_to source, class: "member-group-link prepend-left-5" do + = "· #{source.name}" .hidden-xs.cgray - if member.request? |