Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set password manually when creating new user #1017

Merged
merged 10 commits into from Jul 20, 2019

Merge branch 'develop' into user-set-password

  • Loading branch information...
amosfolz committed Jul 12, 2019
commit a8217f39813bc68237c0b93c87bccd783b23c56d
@@ -24,7 +24,7 @@ function attachUserForm() {
// Reload page on success
window.location.reload();
});

toggleSetPasswordMode(modal, 'link');

// On submission, submit either the PUT request, or POST for a password reset, depending on the toggle state
@@ -49,14 +49,14 @@ function toggleSetPasswordMode(el, changePasswordMode) {
if (validator) {
//Iterate through named elements inside of the form, and mark them as error free
el.find("input[type='password']").each(function() {
validator.successList.push(this); //mark as error free
validator.successList.push(this); //mark as error free
});
validator.resetForm();//remove error class on name elements and clear history
validator.reset();//remove all error and success data
validator.resetForm(); //remove error class on name elements and clear history
validator.reset(); //remove all error and success data
}
el.find("input[type='password']").closest('.form-group')
.removeClass('has-error has-success');
el.find('.form-control-feedback').each(function () {
.removeClass('has-error has-success');
el.find('.form-control-feedback').each(function() {
$(this).remove();
});
} else {
@@ -138,7 +138,7 @@ function updateUser(userName, fieldName, fieldValue) {
}
}
}
}).fail(function (jqXHR) {
}).fail(function(jqXHR) {
// Error messages
if (debugAjax && jqXHR.responseText) {
document.write(jqXHR.responseText);
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.