kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '24861-stringify-group-member-details' into 'master'

Browse source 
Hide form inputs for group member without editing rights

Closes #24861

See merge request !7816
This commit is contained in:
Clement Ho 2017-03-30 22:04:28 +00:00
commit bcb0a554dd
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/shared/members/_member.html.haml
View file

@ -31,7 +31,7 @@
Joined #{time_ago_with_tooltip(member.created_at)} Joined #{time_ago_with_tooltip(member.created_at)}
- if member.expires? - 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)} Expires in #{distance_of_time_in_words_to_now(member.expires_at)}
- else - else
@ -47,7 +47,7 @@
- current_resource = @project || @group - current_resource = @project || @group
.controls.member-controls .controls.member-controls
- if show_controls && member.source == current_resource - 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| = form_for member, remote: true, html: { class: 'form-horizontal js-edit-member-form' } do |f|
= f.hidden_field :access_level = f.hidden_field :access_level
.member-form-control.dropdown.append-right-5 .member-form-control.dropdown.append-right-5

4
changelogs/unreleased/24861-stringify-group-member-details.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Hide form inputs for group member without editing rights
merge_request: 7816
author: