Fixed issue #15768: After adding new admin users the user it not redi…

…rected to setting user rights afterwards (#1824) Dev Opening modal after creating user
LimeSurvey · Mar 29, 2021 · 0959a61 · 0959a61
1 parent 93fa87d
commit 0959a61
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/application/controllers/UserManagementController.php b/application/controllers/UserManagementController.php
@@ -1184,7 +1184,8 @@ private function createAdminUser($aUser)
             if ($success) {
                 $data = [
                     'success' => $success,
-                    'message' => $sReturnMessage
+                    'message' => $sReturnMessage,
+                    'href' => Yii::app()->getController()->createUrl('userManagement/userPermissions', ['userid' => $newUser['uid']]),
                 ];
             } else {
                 $data = [

diff --git a/assets/packages/usermanagement/js/usermanagement.js b/assets/packages/usermanagement/js/usermanagement.js
@@ -83,6 +83,11 @@ var UserManagement = function () {
                         if (!result.hasOwnProperty('html')) {
                             triggerModalClose();
                             window.LS.notifyFader(result.message, 'well-lg text-center ' + (result.success ? 'bg-primary' : 'bg-danger'));
+                            if (result.hasOwnProperty('href')) {
+                                setTimeout(function() {
+                                    openModal(result.href);
+                                }, 500);
+                            }
                             return;
                         }
                         $('#exitForm').on('click.USERMANAGERMODAL', function (e) {
@@ -265,14 +270,7 @@ var UserManagement = function () {
         });
         $('.UserManagement--action--openmodal').on('click', function () {
             var href = $(this).data('href');
-            startModalLoader();
-            $.ajax({
-                url: href,
-                success: function (html) {
-                    applyModalHtml(html);
-                }
-            });
-
+            openModal(href);
         });
         bindListItemclick();
     };
@@ -287,6 +285,16 @@ var UserManagement = function () {
         });
     };
 
+    var openModal = function(href) {
+        startModalLoader();
+        $.ajax({
+            url: href,
+            success: function (html) {
+                applyModalHtml(html);
+            }
+        });
+    };
+
     $(document).on('ready  pjax:scriptcomplete', function () {
         bindButtons();
         bindModals();