DEV: renamed ajaxrequest for new QuestionEditorController.php

LimeSurvey · Jun 2, 2020 · c3bff4d · c3bff4d
1 parent 50db2fc
commit c3bff4d
Show file tree

Hide file tree

Showing 8 changed files with 4,663 additions and 4,096 deletions.
diff --git a/application/controllers/QuestionEditorController.php b/application/controllers/QuestionEditorController.php
@@ -132,6 +132,7 @@ public function actionView($surveyid, $gid = null, $qid = null, $landOnSideMenuT
                 'subquestions' => SettingsUser::getUserSettingValue('subquestionprefix', App()->user->id) ?? 'SQ',
             ],
             'startInEditView' => SettingsUser::getUserSettingValue('noViewMode', App()->user->id) == '1',
+          //  'connectorBaseUrl' => 'questionEditor',
             'connectorBaseUrl' => 'admin/questioneditor',
             'questionSelectorType' => $questionSelectorType,
             'i10N' => [

diff --git a/application/models/QuestionCreate.php b/application/models/QuestionCreate.php
@@ -14,7 +14,7 @@ public static function getInstance($iSurveyId, $type)
         } else {
             $questionType = SettingsUser::getUserSettingValue('preselectquestiontype', null, null, null, Yii::app()->getConfig('preselectquestiontype'));
         }
-        $oCurrentGroup = Questiongroup::model()->findByPk($gid);
+        $oCurrentGroup = QuestionGroup::model()->findByPk($gid);
         $temporaryTitle = 'G'.str_pad($oCurrentGroup->group_order, 2, '0', STR_PAD_LEFT).'Q'.str_pad((safecount($oSurvey->baseQuestions)+1), 2, '0', STR_PAD_LEFT);
         $aQuestionData = [
                 'sid' => $iSurveyId,

diff --git a/application/views/admin/super/sidemenu.php b/application/views/admin/super/sidemenu.php
@@ -22,7 +22,7 @@
     $getQuestionsUrl = $this->createUrl("/admin/survey/sa/getAjaxQuestionGroupArray/", ["surveyid" => $surveyid]);
     $getMenuUrl = $this->createUrl("/admin/survey/sa/getAjaxMenuArray/", ["surveyid" => $surveyid]);
     $createQuestionGroupLink = $this->createUrl("admin/questiongroups/sa/add/", ["surveyid" =>  $surveyid]);
-    $createQuestionLink = "admin/questioneditor/sa/view/surveyid/".$surveyid;
+    $createQuestionLink = "questionEditor/view/surveyid/".$surveyid;
     $unlockLockOrganizerUrl = $this->createUrl("admin/user/sa/togglesetting/", ['surveyid' => $surveyid]);
 
     $updateOrderLink =  $this->createUrl("admin/questiongroups/sa/updateOrder/", ["surveyid" =>  $surveyid]);

diff --git a/assets/packages/questioneditor/build.min/js/questionedit.js b/assets/packages/questioneditor/build.min/js/questionedit.js
diff --git a/assets/packages/questioneditor/build.min/js/questionedit.js.map b/assets/packages/questioneditor/build.min/js/questionedit.js.map
diff --git a/assets/packages/questioneditor/build/js/questionedit.js b/assets/packages/questioneditor/build/js/questionedit.js
diff --git a/assets/packages/questioneditor/build/js/questionedit.js.map b/assets/packages/questioneditor/build/js/questionedit.js.map
diff --git a/assets/packages/questioneditor/src/storage/actions.js b/assets/packages/questioneditor/src/storage/actions.js
@@ -68,9 +68,9 @@ export default {
         return Promise.all([
             new Promise((resolve, reject) => {
                 const postUrl = LS.createUrl(
-                    window.QuestionEditData.connectorBaseUrl,
+                    "questionEditor/getQuestionData",
                     {
-                        sa: "getQuestionData",
+                       // sa: "getQuestionData",
                         sid: context.getters.surveyid
                     }
                 );
@@ -142,9 +142,10 @@ export default {
             }),
             new Promise((resolve, reject) => {
                 const postUrl = LS.createUrl(
-                    window.QuestionEditData.connectorBaseUrl,
+                    //window.QuestionEditData.connectorBaseUrl,
+                    "questionEditor/getQuestionPermissions",
                     {
-                        sa: "getQuestionPermissions",
+                        //sa: "getQuestionPermissions",
                         sid: context.getters.surveyid
                     }
                 );
@@ -170,9 +171,10 @@ export default {
     getQuestionGeneralSettings: (context, questionTheme = "core") => {
         return new Promise((resolve, reject) => {
             const postUrl = LS.createUrl(
-                window.QuestionEditData.connectorBaseUrl,
+                //window.QuestionEditData.connectorBaseUrl,
+                "questionEditor/getGeneralOptions",
                 {
-                    sa: "getGeneralOptions",
+                    //sa: "getGeneralOptions",
                     sid: context.getters.surveyid
                 }
             );
@@ -222,9 +224,10 @@ export default {
     getQuestionAdvancedSettings: context => {
         return new Promise((resolve, reject) => {
             const postUrl = LS.createUrl(
-                window.QuestionEditData.connectorBaseUrl,
+               // window.QuestionEditData.connectorBaseUrl,
+                "questionEditor/getAdvancedOptions",
                 {
-                    sa: "getAdvancedOptions",
+                    //sa: "getAdvancedOptions",
                     sid: context.getters.surveyid
                 }
             );
@@ -274,10 +277,14 @@ export default {
         });
     },
     getQuestionTypes: context => {
-        const postUrl = LS.createUrl(window.QuestionEditData.connectorBaseUrl, {
-            sa: "getQuestionTypeList",
-            sid: context.getters.surveyid
-        });
+        const postUrl = LS.createUrl(
+            //window.QuestionEditData.connectorBaseUrl,
+            "questionEditor/getQuestionTypeList",
+            {
+                //sa: "getQuestionTypeList",
+                sid: context.getters.surveyid
+            }
+            );
 
         ajax.methods
             .$_get(postUrl)
@@ -292,9 +299,10 @@ export default {
     reloadQuestion: context => {
         return new Promise((resolve, reject) => {
             const postUrl = LS.createUrl(
-                window.QuestionEditData.connectorBaseUrl,
+                //window.QuestionEditData.connectorBaseUrl,
+                "questionEditor/reloadQuestionData",
                 {
-                    sa: "reloadQuestionData",
+                    //sa: "reloadQuestionData",
                     sid: context.getters.surveyid
                 }
             );
@@ -374,7 +382,7 @@ export default {
                             context.state.currentQuestionAdvancedSettings
                     }
                 },
-                window.LS.data.csrfTokenData
+              window.LS.data.csrfTokenData
             );
 
             if (context.state.initCopy == true) {
@@ -392,9 +400,10 @@ export default {
             });
 
             const postUrl = LS.createUrl(
-                window.QuestionEditData.connectorBaseUrl,
+              //  window.QuestionEditData.connectorBaseUrl + "/saveQuestionData",
+                "questionEditor/saveQuestionData",
                 {
-                    sa: "saveQuestionData",
+                   // sa: "saveQuestionData",
                     gid: context.state.currentQuestion.gid,
                     sid: context.getters.surveyid
                 }