Fixed issue #15979: "Save and add group" plus "Save and add question"…

… do not work correctly. (#1515) Updated question groups controller and Vue to handle the different scenarios ('save-and-new' and 'save-and-new-question') with redirects. Removed links from the "Save and..." buttons. Updated side panel's updateQuestiongroups mutation to trigger the link update.
LimeSurvey · Aug 10, 2020 · 1b7c70c · 1b7c70c
1 parent 4b0890a
commit 1b7c70c
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 28 deletions.
diff --git a/application/controllers/admin/questiongroups.php b/application/controllers/admin/questiongroups.php
@@ -515,6 +515,7 @@ public function saveQuestionGroupData($sid)
     {
         $questionGroup = App()->request->getPost('questionGroup', []);
         $questionGroupI10N = App()->request->getPost('questionGroupI10N', []);
+        $sScenario = App()->request->getPost('scenario', '');
         $iSurveyId = (int) $sid;
 
         $oQuestionGroup = QuestionGroup::model()->findByPk($questionGroup['gid']);
@@ -525,13 +526,34 @@ public function saveQuestionGroupData($sid)
         }
 
         $landOnSideMenuTab = 'structure';
-        $sRedirectUrl = $this->getController()->createUrl(
-            'admin/questiongroups/sa/view/',
-            [
-                'surveyid' => $iSurveyId,
-                'gid' => $oQuestionGroup->gid,
-                'landOnSideMenuTab' => $landOnSideMenuTab]
-        );
+        switch ($sScenario) {
+            case 'save-and-new-question':
+                $sRedirectUrl = $this->getController()->createUrl(
+                    'admin/questions/sa/newquestion/',
+                    [
+                        'surveyid' => $iSurveyId,
+                        'gid' => $oQuestionGroup->gid,
+                    ]
+                );
+                break;
+            case 'save-and-new':
+                $sRedirectUrl = $this->getController()->createUrl(
+                    'admin/questiongroups/sa/add/',
+                    [
+                        'surveyid' => $iSurveyId,
+                    ]
+                );
+                break;
+            default:
+                $sRedirectUrl = $this->getController()->createUrl(
+                    'admin/questiongroups/sa/view/',
+                    [
+                        'surveyid' => $iSurveyId,
+                        'gid' => $oQuestionGroup->gid,
+                        'landOnSideMenuTab' => $landOnSideMenuTab
+                    ]
+                );
+        }
 
         $success = $this->_applyI10N($oQuestionGroup, $questionGroupI10N);
 

diff --git a/application/views/admin/survey/topbar/question_group_topbar.php b/application/views/admin/survey/topbar/question_group_topbar.php
@@ -244,11 +244,6 @@
 
 // Save and Close Button
 if ($ownsSaveButton == true) {
-    $saveAndNewLink = $this->createUrl("admin/questiongroups/sa/add/", ["surveyid" => $sid]);
-
-    $paramArray = $gid != null ? [ "surveyid" => $sid, 'gid' => $gid] : [ "surveyid" => $sid ];
-    $saveAndAddQuestionLink = $this->createUrl("admin/questions/sa/newquestion/", $paramArray);
-
     $saveButton = [
         'id' => 'save',
         'name' => gT('Save'),
@@ -264,7 +259,7 @@
         'id' => 'save-and-new-button',
         'name' => gT('Save and add group'),
         'icon' => 'fa fa-plus-square',
-        'url' => $saveAndNewLink,
+        'scenario' => 'save-and-new',
         'isSaveButton' => true,
         'class' => 'btn-default',
     ];
@@ -274,7 +269,7 @@
         'id' => 'save-and-new-question-button',
         'icon' => 'fa fa-plus',
         'name' => gT('Save and add question'),
-        'url' => $saveAndAddQuestionLink,
+        'scenario' => 'save-and-new-question',
         'isSaveButton' => true,
         'class' => 'btn-default',
     ];

diff --git a/assets/packages/questiongroup/build.min/css/main.css b/assets/packages/questiongroup/build.min/css/main.css
diff --git a/assets/packages/questiongroup/build.min/js/questiongroupedit.js b/assets/packages/questiongroup/build.min/js/questiongroupedit.js
diff --git a/assets/packages/questiongroup/build.min/js/questiongroupedit.js.map b/assets/packages/questiongroup/build.min/js/questiongroupedit.js.map
diff --git a/assets/packages/questiongroup/build/js/questiongroupedit.js b/assets/packages/questiongroup/build/js/questiongroupedit.js
@@ -63,7 +63,7 @@
 /******/
 /******/ 	var hotApplyOnUpdate = true;
 /******/ 	// eslint-disable-next-line no-unused-vars
-/******/ 	var hotCurrentHash = "7bea8fa14fa5b844b577";
+/******/ 	var hotCurrentHash = "07522311524c7026f31e";
 /******/ 	var hotRequestTimeout = 10000;
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentChildModule;
@@ -148871,8 +148871,9 @@ __webpack_require__.r(__webpack_exports__);
 
       var redirect = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var redirectUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      var scenario = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       this.loading = true;
-      this.$store.dispatch('saveQuestionGroupData').then(function (result) {
+      this.$store.dispatch('saveQuestionGroupData', scenario).then(function (result) {
         window.LS.notifyFader(result.data.message, 'well-lg bg-primary text-center');
 
         _this2.$log.log('OBJECT AFTER TRANSFER: ', result);
@@ -148936,7 +148937,9 @@ __webpack_require__.r(__webpack_exports__);
     });
     LS.EventBus.$off('componentFormSubmit');
     LS.EventBus.$on('componentFormSubmit', function (payload) {
-      _this4.submitCurrentState(payload.id == '#save-and-close-button', payload.url != '#' ? payload.url : false);
+      var redirect = payload.id == 'save-and-close-button' || payload.id == 'save-and-new-question-button' || payload.id == 'save-and-new-button';
+
+      _this4.submitCurrentState(redirect, payload.url != '#' ? payload.url : false, payload.scenario || '');
     });
 
     if (window.QuestionGroupEditData.startInEditView) {
@@ -186048,13 +186051,16 @@ __webpack_require__.r(__webpack_exports__);
     });
   },
   saveQuestionGroupData: function saveQuestionGroupData(context) {
+    var scenario = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+
     if (context.state.inTransfer) {
       return Promise.resolve(false);
     }
 
     var transferObject = lodash_merge__WEBPACK_IMPORTED_MODULE_2___default()({
       'questionGroup': context.state.currentQuestionGroup,
-      'questionGroupI10N': context.state.currentQuestionGroupI10N
+      'questionGroupI10N': context.state.currentQuestionGroupI10N,
+      'scenario': scenario
     }, window.LS.data.csrfTokenData);
     return new Promise(function (resolve, reject) {
       context.commit('setInTransfer', true);

diff --git a/assets/packages/questiongroup/build/js/questiongroupedit.js.map b/assets/packages/questiongroup/build/js/questiongroupedit.js.map
diff --git a/assets/packages/questiongroup/src/App.vue b/assets/packages/questiongroup/src/App.vue
@@ -82,9 +82,9 @@ export default {
         eventSet() {
             this.event = null;
         },
-        submitCurrentState(redirect = false, redirectUrl = false) {
+        submitCurrentState(redirect = false, redirectUrl = false, scenario = false) {
             this.loading = true;
-            this.$store.dispatch('saveQuestionGroupData').then(
+            this.$store.dispatch('saveQuestionGroupData', scenario).then(
                 (result) => {
                     window.LS.notifyFader(result.data.message, 'well-lg bg-primary text-center');
                     this.$log.log('OBJECT AFTER TRANSFER: ', result);
@@ -146,7 +146,14 @@ export default {
 
         LS.EventBus.$off('componentFormSubmit');
         LS.EventBus.$on('componentFormSubmit', (payload) => {
-            this.submitCurrentState((payload.id == '#save-and-close-button'), payload.url != '#' ? payload.url : false);
+            let redirect = (payload.id == 'save-and-close-button' ||
+                            payload.id == 'save-and-new-question-button' ||
+                            payload.id == 'save-and-new-button');
+            this.submitCurrentState(
+                redirect, 
+                payload.url != '#' ? payload.url : false, 
+                payload.scenario || ''
+            );
         });
         
         if(window.QuestionGroupEditData.startInEditView) {

diff --git a/assets/packages/questiongroup/src/storage/actions.js b/assets/packages/questiongroup/src/storage/actions.js
@@ -69,14 +69,15 @@ export default {
             });
         });
     },
-    saveQuestionGroupData: (context) => {
+    saveQuestionGroupData: (context, scenario='') => {
         if(context.state.inTransfer ) {
             return Promise.resolve(false);
         }
 
         let transferObject = merge({
             'questionGroup': context.state.currentQuestionGroup,
-            'questionGroupI10N': context.state.currentQuestionGroupI10N
+            'questionGroupI10N': context.state.currentQuestionGroupI10N,
+            'scenario': scenario
         }, window.LS.data.csrfTokenData);
 
         return new Promise((resolve, reject) => {