Merge pull request #1011 from inuryyev/hotfix-development

Fix #1008 and #1010
userfrosting · Jul 6, 2019 · dee9f89 · dee9f89
2 parents fb1b721 + 70b8d47
commit dee9f89
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/app/sprinkles/admin/asset-bundles.json b/app/sprinkles/admin/asset-bundles.json
@@ -75,6 +75,7 @@
         },
         "js/pages/role": {
             "scripts": [
+                "userfrosting/js/widgets/users.js",
                 "userfrosting/js/widgets/roles.js",
                 "userfrosting/js/pages/role.js"
             ],

diff --git a/app/sprinkles/admin/assets/userfrosting/js/pages/role.js b/app/sprinkles/admin/assets/userfrosting/js/pages/role.js
@@ -20,4 +20,9 @@ $(document).ready(function() {
         dataUrl: site.uri.public + '/api/roles/r/' + page.role_slug + '/users',
         useLoadingTransition: site.uf_table.use_loading_transition
     });
+
+    // Bind table buttons
+    $("#widget-role-users").on("pagerComplete.ufTable", function () {
+        bindUserButtons($(this));
+    });
 });
diff --git a/app/sprinkles/admin/assets/userfrosting/js/widgets/users.js b/app/sprinkles/admin/assets/userfrosting/js/widgets/users.js
@@ -226,7 +226,6 @@ function updateUser(userName, fieldName, fieldValue) {
 
             // On submission, submit either the PUT request, or POST for a password reset, depending on the toggle state
             modal.find("input[name='change_password_mode']").click(function(e) {
-                e.preventDefault();
 
                 var changePasswordMode = $(this).val();
                 toggleChangePasswordMode(modal, userName, changePasswordMode);