summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushal@gitlab.com>2016-11-29 13:50:57 +0530
committerKushal Pandya <kushal@gitlab.com>2017-02-27 23:40:15 +0530
commit98a691629d93b2ff3dfbc060b3e25b8ebec6e34b (patch)
treef3b63a46b41f908eb02c708842b5aafd659a42ac
parent90040620cba77620a57e028d25e6148c72494fbd (diff)
downloadgitlab-ce-98a691629d93b2ff3dfbc060b3e25b8ebec6e34b.tar.gz
Hide form inputs for user without access
-rw-r--r--app/views/shared/members/_member.html.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index 8e721c9c8dd..a797e8f0799 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -24,6 +24,7 @@
= link_to source.full_name, source, class: "member-group-link"
.hidden-xs.cgray
+ - expires_soon = member.expires_soon?
- if member.request?
Requested
= time_ago_with_tooltip(member.requested_at)
@@ -31,7 +32,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 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 +48,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