Commit e888c935 authored by Phil Hughes's avatar Phil Hughes

Removes weird gap when LDAP override is enabled

Adds spinner to change permissions button
parent 988c6d88
......@@ -110,10 +110,13 @@
const $btn = $(e.currentTarget);
const { $memberListItem, $toggle, $dateInput } = this.getMemberListItems($btn);
$btn.attr('disabled', true).disable();
this.overrideLdap($memberListItem, $btn.data('endpoint'), true).then(() => {
this.showLDAPPermissionsWarning(e);
$toggle.removeAttr('disabled');
$dateInput.removeAttr('disabled');
$btn.removeAttr('disabled').enable();
});
}
......
......@@ -8,12 +8,6 @@
.btn-ldap-override {
display: none!important;
}
.form-horizontal {
@media (min-width: $screen-sm-min) {
margin-right: 45px;
}
}
}
.list-item-name {
......
......@@ -127,9 +127,10 @@
= user.name
is currently an LDAP user. Editing their permissions will override the settings from the LDAP group sync.
.controls
%button.btn.btn-warning.js-ldap-override{ type: "button",
%button.btn.btn-warning.btn-loading.js-ldap-override{ type: "button",
"aria-label" => "Change LDAP member permissions",
data: { el_id: dom_id(member), endpoint: override_group_group_member_path(@group, member) } }
= icon('spinner spin')
Change permissions
%button.btn.btn-default.js-ldap-permissions{ type: "button",
"aria-label" => "Close permissions override",
......
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