Skip to content

Commit 278500c

Browse files
Silic0nS0ldieralexweissman
authored andcommitted
Fixed manually setting user password for admins. Incremented for version 4.0.22-Alpha.
1 parent eec1f6d commit 278500c

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Change Log
22

3+
## v.4.0.22-Alpha
4+
- Fix issue where 'Change User Password' popup form couldn't handle specifying a new password.
5+
36
## v.4.0.21-Alpha
47
- Implement reflow and column selector for tables (#670)
58
- Overhauled ufAlerts, improving efficiency, reliability, and fixed a discovered edge case that caused `render` to never complete. (part of #646)

app/defines.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace UserFrosting;
44

55
// Some standard defines
6-
define('UserFrosting\VERSION', '4.0.21-alpha');
6+
define('UserFrosting\VERSION', '4.0.22-alpha');
77
define('UserFrosting\DS', '/');
88
define('UserFrosting\PHP_MIN_VERSION', '5.6');
99
define('UserFrosting\DEBUG_CONFIG', false);

app/sprinkles/admin/assets/local/widgets/js/users.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ function toggleChangePasswordMode(el, userName, changePasswordMode) {
3232
if (changePasswordMode == 'link') {
3333
$(".controls-password").find("input[type='password']").prop('disabled', true);
3434
// Form submits password reset request
35-
var form = el.find("form");
36-
form
37-
.prop('method', 'POST')
38-
.prop('action', site.uri.public + '/api/users/u/' + userName + '/password-reset');
35+
el.find("form").attr({
36+
method: 'POST',
37+
action: site.uri.public + '/api/users/u/' + userName + '/password-reset'
38+
});
3939

4040
var validator = form.validate();
4141
if (validator) {
@@ -54,9 +54,10 @@ function toggleChangePasswordMode(el, userName, changePasswordMode) {
5454
} else {
5555
$(".controls-password").find("input[type='password']").prop('disabled', false);
5656
// Form submits direct password update
57-
el.find("form")
58-
.prop('method', 'PUT')
59-
.prop('action', site.uri.public + '/api/users/u/' + userName + '/password');
57+
el.find("form").attr({
58+
method: 'PUT',
59+
action: site.uri.public + '/api/users/u/' + userName + '/password'
60+
});
6061
}
6162
}
6263

0 commit comments

Comments
 (0)