diff options
| author | Dennis Tang <dtang@gitlab.com> | 2019-05-08 21:51:25 +0200 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2019-05-08 21:51:25 +0200 |
| commit | c093d4d00c279934b463b36c46ed71e77c14c259 (patch) | |
| tree | 4194850914e15c0a9f6c5f6296e147c057b53a99 | |
| parent | 9674ed7129189047c72a0111455118283a4dfa4b (diff) | |
| download | gitlab-ce-ce-6357-extract-ee-specific-files-lines-for-some-app-views-shared-members-_member-html-haml.tar.gz | |
Extract EE specific files/lines for some app/views/shared/members/_member.html.hamlce-6357-extract-ee-specific-files-lines-for-some-app-views-shared-members-_member-html-haml
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 2db1f67a793..a5367660a11 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -54,6 +54,7 @@ - if show_roles - current_resource = @project || @group .controls.member-controls + = render_if_exists 'shared/members/ee/ldap_tag', can_override: member.try(:can_override?) - if show_controls && member.source == current_resource - if member.can_resend_invite? @@ -67,6 +68,7 @@ = f.hidden_field :access_level .member-form-control.dropdown.append-right-5 %button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button", + disabled: member.try(:can_override?) && !member.try(:override?), data: { toggle: "dropdown", field_name: "#{f.object_name}[access_level]" } } %span.dropdown-toggle-text = member.human_access @@ -80,8 +82,13 @@ = link_to role, "javascript:void(0)", class: ("is-active" if member.access_level == role_id), data: { id: role_id, el_id: dom_id(member) } + = render_if_exists 'shared/members/ee/revert_ldap_group_sync_option', + group: @group, + member: member, + can_override: member.try(:can_override?) .prepend-left-5.clearable-input.member-form-control = f.text_field :expires_at, + disabled: member.try(:can_override?) && !member.try(:override?), class: 'form-control js-access-expiration-date js-member-update-control', placeholder: _('Expiration date'), id: "member_expires_at_#{member.id}", @@ -116,5 +123,8 @@ = _("Delete") - unless force_mobile_view = icon('trash', class: 'd-none d-sm-block') + = render_if_exists 'shared/members/ee/override_member_buttons', group: @group, member: member, user: user, action: :edit, can_override: member.try(:can_override?) - else %span.member-access-text= member.human_access + += render_if_exists 'shared/members/ee/override_member_buttons', group: @group, member: member, user: user, action: :confirm, can_override: member.try(:can_override?) |