Skip to content

Commit dee9f89

Browse files
authored
Merge pull request #1011 from inuryyev/hotfix-development
Fix #1008 and #1010
2 parents fb1b721 + 70b8d47 commit dee9f89

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

app/sprinkles/admin/asset-bundles.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
},
7676
"js/pages/role": {
7777
"scripts": [
78+
"userfrosting/js/widgets/users.js",
7879
"userfrosting/js/widgets/roles.js",
7980
"userfrosting/js/pages/role.js"
8081
],

app/sprinkles/admin/assets/userfrosting/js/pages/role.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,9 @@ $(document).ready(function() {
2020
dataUrl: site.uri.public + '/api/roles/r/' + page.role_slug + '/users',
2121
useLoadingTransition: site.uf_table.use_loading_transition
2222
});
23+
24+
// Bind table buttons
25+
$("#widget-role-users").on("pagerComplete.ufTable", function () {
26+
bindUserButtons($(this));
27+
});
2328
});

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ function updateUser(userName, fieldName, fieldValue) {
226226

227227
// On submission, submit either the PUT request, or POST for a password reset, depending on the toggle state
228228
modal.find("input[name='change_password_mode']").click(function(e) {
229-
e.preventDefault();
230229

231230
var changePasswordMode = $(this).val();
232231
toggleChangePasswordMode(modal, userName, changePasswordMode);

0 commit comments

Comments
 (0)