Commit 25b494cf authored by Phil Hughes's avatar Phil Hughes

Added disabled styling

Fixes active items being selectable
parent 3efb7139
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
isSelectable(selected, $el) { isSelectable(selected, $el) {
const $link = $($el); const $link = $($el);
return $link.data('revert'); return $link.data('revert') || $link.hasClass('.is-active');
}, },
fieldName: $btn.data('field-name'), fieldName: $btn.data('field-name'),
id(selected, $el) { id(selected, $el) {
......
...@@ -42,6 +42,11 @@ ...@@ -42,6 +42,11 @@
border-radius: $border-radius-base; border-radius: $border-radius-base;
white-space: nowrap; white-space: nowrap;
&[disabled] {
background-color: $input-bg-disabled;
cursor: not-allowed;
}
&.no-outline { &.no-outline {
outline: 0; outline: 0;
} }
......
...@@ -57,10 +57,9 @@ ...@@ -57,10 +57,9 @@
- if user != current_user - if user != current_user
= 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
-# = f.select :access_level, options_for_select(member.class.access_level_roles, member.access_level), {}, class: 'form-control member-form-control append-right-5 js-member-update-control', id: "member_access_level_#{member.id}", disabled: !can_admin_member
.member-form-control.dropdown.append-right-5 .member-form-control.dropdown.append-right-5
%button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button", %button.dropdown-menu-toggle.js-member-permissions-dropdown{ type: "button",
disabled: member.ldap && !member.override, disabled: !can_admin_member,
data: { toggle: "dropdown", field_name: "#{f.object_name}[access_level]" } } data: { toggle: "dropdown", field_name: "#{f.object_name}[access_level]" } }
%span.dropdown-toggle-text %span.dropdown-toggle-text
= member.human_access = member.human_access
...@@ -71,16 +70,14 @@ ...@@ -71,16 +70,14 @@
%ul %ul
- Gitlab::Access.options.each do |role, role_id| - Gitlab::Access.options.each do |role, role_id|
%li %li
%a{ href: "javascript:void(0)", = link_to role, "javascript:void(0)",
class: ("is-active" if member.access_level == role_id), class: ("is-active" if member.access_level == role_id),
data: { id: role_id } } data: { id: role_id }
= role
- if member.ldap - if member.ldap
%li.divider %li.divider
%li %li
%a{ href: "javascript:void(0)", = link_to "Revert to LDAP group sync settings", "javascript:void(0)",
data: { revert: "true", endpoint: update_url, id: dom_id(member) } } data: { revert: "true", endpoint: update_url, id: dom_id(member) }
Revert to LDAP group sync settings
.prepend-left-5.clearable-input.member-form-control .prepend-left-5.clearable-input.member-form-control
= f.text_field :expires_at, class: 'form-control js-access-expiration-date js-member-update-control', placeholder: 'Expiration date', id: "member_expires_at_#{member.id}", disabled: !can_admin_member = f.text_field :expires_at, class: 'form-control js-access-expiration-date js-member-update-control', placeholder: 'Expiration date', id: "member_expires_at_#{member.id}", disabled: !can_admin_member
%i.clear-icon.js-clear-input %i.clear-icon.js-clear-input
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment