diff options
author | Luke Bennett <lbennett@gitlab.com> | 2019-05-29 13:01:43 +0100 |
---|---|---|
committer | Luke Bennett <lbennett@gitlab.com> | 2019-05-31 20:21:55 +0100 |
commit | 5b010ea0f331a1dbc65614d740375a7156c61920 (patch) | |
tree | d7ad75d095910ee6395ef0f4865d8fea5cf97a96 | |
parent | b9798c157ac5973e9dd2b7ad95267014034a219f (diff) | |
download | gitlab-ce-members-scb.tar.gz |
Closes fix-search-dropdown-blur-closemembers-scb
Resolve CE/EE diffs in members view
Part of single codebase changes.
-rw-r--r-- | app/presenters/member_presenter.rb | 4 | ||||
-rw-r--r-- | app/views/shared/members/_member.html.haml | 12 | ||||
-rw-r--r-- | app/views/shared/members/_requests.html.haml | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/app/presenters/member_presenter.rb b/app/presenters/member_presenter.rb index 9e9b6973b8e..ac8477a481f 100644 --- a/app/presenters/member_presenter.rb +++ b/app/presenters/member_presenter.rb @@ -32,6 +32,10 @@ class MemberPresenter < Gitlab::View::Presenter::Delegated request? && can_update? end + def can_override? + false + end + private def admin_member_permission diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 2db1f67a793..059ac657c6d 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -3,9 +3,10 @@ - force_mobile_view = local_assigns.fetch(:force_mobile_view, false) - member = local_assigns.fetch(:member) - user = local_assigns.fetch(:user, member.user) +- override = local_assigns.fetch(:override?, false) - source = member.source -%li.member{ class: dom_class(member), id: dom_id(member) } +%li.member{ class: [dom_class(member), ("is-overridden" if override)], id: dom_id(member) } %span.list-item-name - if user = image_tag avatar_icon_for_user(user, 40), class: "avatar s40", alt: '' @@ -54,6 +55,7 @@ - if show_roles - current_resource = @project || @group .controls.member-controls + = render_if_exists 'shared/members/ee/ldap_tag', member: member - if show_controls && member.source == current_resource - if member.can_resend_invite? @@ -67,6 +69,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.can_override? && !override, data: { toggle: "dropdown", field_name: "#{f.object_name}[access_level]" } } %span.dropdown-toggle-text = member.human_access @@ -80,8 +83,12 @@ = 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 .prepend-left-5.clearable-input.member-form-control = f.text_field :expires_at, + disabled: member.can_override? && !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 - 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 diff --git a/app/views/shared/members/_requests.html.haml b/app/views/shared/members/_requests.html.haml index 1f62c3cbcf4..da4cf18a9d9 100644 --- a/app/views/shared/members/_requests.html.haml +++ b/app/views/shared/members/_requests.html.haml @@ -10,4 +10,4 @@ %strong= membership_source.name %span.badge.badge-pill= requesters.size %ul.content-list.members-list - = render partial: 'shared/members/member', collection: requesters, as: :member, locals: { force_mobile_view: force_mobile_view } + = render_if_exists partial: 'shared/members/member', collection: requesters, as: :member, locals: { force_mobile_view: force_mobile_view } |