diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-03-30 22:04:28 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-03-30 22:04:28 +0000 |
| commit | bcb0a554dd4f8754ab1d6a876edc1481e04aa711 (patch) | |
| tree | 25b2053f9d84fa287d5bf98b6f46a453224e2ad1 | |
| parent | 678d7e6bf31fa44cac269aba6e4b01559ced29e9 (diff) | |
| parent | 7cd1b5104a21ab74f5c1a24fac697e90290ae4d9 (diff) | |
| download | gitlab-ce-bcb0a554dd4f8754ab1d6a876edc1481e04aa711.tar.gz | |
Merge branch '24861-stringify-group-member-details' into 'master'
Hide form inputs for group member without editing rights
Closes #24861
See merge request !7816
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/24861-stringify-group-member-details.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 8e721c9c8dd..a5aa768b1b2 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -31,7 +31,7 @@ Joined #{time_ago_with_tooltip(member.created_at)} - if member.expires? ยท - %span{ class: ('text-warning' if member.expires_soon?) } + %span{ class: "#{"text-warning" if member.expires_soon?} has-tooltip", title: member.expires_at.to_time.in_time_zone.to_s(:medium) } Expires in #{distance_of_time_in_words_to_now(member.expires_at)} - else @@ -47,7 +47,7 @@ - current_resource = @project || @group .controls.member-controls - if show_controls && member.source == current_resource - - if user != current_user + - if user != current_user && can_admin_member = form_for member, remote: true, html: { class: 'form-horizontal js-edit-member-form' } do |f| = f.hidden_field :access_level .member-form-control.dropdown.append-right-5 diff --git a/changelogs/unreleased/24861-stringify-group-member-details.yml b/changelogs/unreleased/24861-stringify-group-member-details.yml new file mode 100644 index 00000000000..f56a1060862 --- /dev/null +++ b/changelogs/unreleased/24861-stringify-group-member-details.yml @@ -0,0 +1,4 @@ +--- +title: Hide form inputs for group member without editing rights +merge_request: 7816 +author: |