Merge branch 'hotfix' into pr/1007

Author: lcharette

.travis.yml

@@ -35,7 +35,8 @@ before_install:
   - nvm install 10.12.0
   # Install Redis and Memcached
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - printf "\n" | pecl install -f redis
+  # Temporary disabled as it's not compatible with PHP 5.6
+  # - printf "\n" | pecl install -f redis
 
 before_script:
   # install deps and UF

CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [PHPMailer] Turn off opportunistic TLS when disabled ([#986], [#987])
 - Migrator now ignore files that don't end in `.php` ([#965], [#998])
 - Respects CSRF_ENABLED environment variable ([#976]; Thanks @Poldovico !)
+- Checkbox bug on password change form ([#1008])
+- On role page, users table action buttons not working ([#1010])
 
 ## [v4.2.2]
 
@@ -777,6 +779,8 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 [#991]: https://github.com/userfrosting/UserFrosting/issues/991
 [#993]: https://github.com/userfrosting/UserFrosting/issues/993
 [#998]: https://github.com/userfrosting/UserFrosting/issues/998
+[#1008]: https://github.com/userfrosting/UserFrosting/issues/1008
+[#1010]: https://github.com/userfrosting/UserFrosting/issues/1010
 
 [v4.2.0]: https://github.com/userfrosting/UserFrosting/compare/v4.1.22...v4.2.0
 [v4.2.1]: https://github.com/userfrosting/UserFrosting/compare/v4.2.0...v.4.2.1

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"
             ],

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));
+    });
 });

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);