#932 Implemented redirect on deletion option for user, role, and group pages

Author: Silic0nS0ldier

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

@@ -9,7 +9,7 @@
 
 $(document).ready(function() {
     // Control buttons
-    bindGroupButtons($("#view-group"));
+    bindGroupButtons($("#view-group"), { delete_redirect: page.delete_redirect });
 
     // Table of users in this group
     $("#widget-group-users").ufTable({

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

@@ -9,7 +9,7 @@
 
 $(document).ready(function() {
     // Control buttons
-    bindRoleButtons($("#view-role"));
+    bindRoleButtons($("#view-role"), { delete_redirect: page.delete_redirect });
 
     $("#widget-role-permissions").ufTable({
         dataUrl: site.uri.public + '/api/roles/r/' + page.role_slug + '/permissions',

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

@@ -9,7 +9,7 @@
 
 $(document).ready(function() {
     // Control buttons
-    bindUserButtons($("#view-user"));
+    bindUserButtons($("#view-user"), { delete_redirect: page.delete_redirect });
 
     // Table of activities
     $("#widget-user-activities").ufTable({

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

@@ -53,8 +53,12 @@ function attachGroupForm() {
 
 /**
  * Link group action buttons, for example in a table or on a specific group's page.
+ * @param {module:jQuery} el jQuery wrapped element to target.
+ * @param {{delete_redirect: string}} options Options used to modify behaviour of button actions.
  */
-function bindGroupButtons(el) {
+function bindGroupButtons(el, options) {
+    if (!options) options = {};
+
     /**
      * Link row buttons after table is loaded.
      */
@@ -95,8 +99,9 @@ function bindGroupButtons(el) {
 
             form.ufForm()
             .on("submitSuccess.ufForm", function() {
-                // Reload page on success
-                window.location.reload();
+                // Navigate or reload page on success
+                if (options.delete_redirect) window.location.href = options.delete_redirect;
+                else window.location.reload();
             });
         });
     });

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

@@ -44,8 +44,12 @@ function attachRoleForm() {
 
 /**
  * Link role action buttons, for example in a table or on a specific role's page.
+ * @param {module:jQuery} el jQuery wrapped element to target.
+ * @param {{delete_redirect: string}} options Options used to modify behaviour of button actions.
  */
-function bindRoleButtons(el) {
+function bindRoleButtons(el, options) {
+    if (!options) options = {};
+
     /**
      * Link row buttons after table is loaded.
      */
@@ -134,8 +138,9 @@ function bindRoleButtons(el) {
 
             form.ufForm()
             .on("submitSuccess.ufForm", function() {
-                // Reload page on success
-                window.location.reload();
+                // Navigate or reload page on success
+                if (options.delete_redirect) window.location.href = options.delete_redirect;
+                else window.location.reload();
             });
         });
     });

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

@@ -125,8 +125,11 @@ function updateUser(userName, fieldName, fieldValue) {
 
 /**
  * Link user action buttons, for example in a table or on a specific user's page.
+ * @param {module:jQuery} el jQuery wrapped element to target.
+ * @param {{delete_redirect: string}} options Options used to modify behaviour of button actions.
  */
- function bindUserButtons(el) {
+ function bindUserButtons(el, options) {
+     if (!options) options = {};
 
     /**
      * Buttons that launch a modal dialog
@@ -243,14 +246,15 @@ function updateUser(userName, fieldName, fieldValue) {
             msgTarget: $("#alerts-page")
         });
 
-        $("body").on('renderSuccess.ufModal', function (data) {
+        $("body").on('renderSuccess.ufModal', function () {
             var modal = $(this).ufModal('getModal');
             var form = modal.find('.js-form');
 
             form.ufForm()
             .on("submitSuccess.ufForm", function() {
-                // Reload page on success
-                window.location.reload();
+                // Navigate or reload page on success
+                if (options.delete_redirect) window.location.href = options.delete_redirect;
+                else window.location.reload();
             });
         });
     });

app/sprinkles/admin/src/Controller/GroupController.php

@@ -601,7 +601,8 @@ public function pageInfo(Request $request, Response $response, $args)
         return $this->ci->view->render($response, 'pages/group.html.twig', [
             'group'  => $group,
             'fields' => $fields,
-            'tools'  => $editButtons
+            'tools'  => $editButtons,
+            'delete_redirect' => $this->ci->router->pathFor('uri_groups')
         ]);
     }
 

app/sprinkles/admin/src/Controller/RoleController.php

@@ -707,7 +707,8 @@ public function pageInfo(Request $request, Response $response, $args)
         return $this->ci->view->render($response, 'pages/role.html.twig', [
             'role'   => $role,
             'fields' => $fields,
-            'tools'  => $editButtons
+            'tools'  => $editButtons,
+            'delete_redirect' => $this->ci->router->pathFor('uri_roles')
         ]);
     }
 

app/sprinkles/admin/src/Controller/UserController.php

@@ -1020,7 +1020,8 @@ public function pageInfo(Request $request, Response $response, $args)
             'locales' => $locales,
             'fields'  => $fields,
             'tools'   => $editButtons,
-            'widgets' => $widgets
+            'widgets' => $widgets,
+            'delete_redirect' => $this->ci->router->pathFor('uri_users')
         ]);
     }
 

app/sprinkles/admin/templates/pages/group.html.twig

@@ -88,11 +88,12 @@
     <script>
     {% include "pages/partials/page.js.twig" %}
 
-    // Add user name
+    // Add group slug
     page = $.extend(
-        true,               // deep extend
+        true, // deep extend
         {
-            "group_slug": "{{group.slug}}"
+            group_slug: "{{group.slug}}",
+            delete_redirect: "{{delete_redirect}}"
         },
         page
     );