Fixed issue #12819: Blank page + json after login

LimeSurvey · Oct 24, 2017 · 3880d8b · 3880d8b
1 parent 01aa487
commit 3880d8b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/application/controllers/admin/TutorialsController.php b/application/controllers/admin/TutorialsController.php
@@ -47,6 +47,10 @@ public function accessRules()
 
 
     public function serveprebuilt(){
+        $ajax = Yii::app()->request->getParam('ajax',false);
+        if($ajax == false){
+            $this->getController()->redirect(['/admin']);
+        }
         $tutorialname = Yii::app()->request->getParam('tutorialname','');
         $model = Tutorials::model();
         $prebuiltObject = $model->getPrebuilt($tutorialname);

diff --git a/application/models/Tutorials.php b/application/models/Tutorials.php
@@ -56,6 +56,7 @@ private function _generatePreBuiltPackage (){
                     ),
                     'reflex' => '.selector__lstour--createsurvey',
                     'redirect' => false,
+                    'onShow' => "(function(){ $('#welcomeModal').modal('hide'); })"
                 ),
                 array( //3
                     'element' => '#surveyls_title',

diff --git a/assets/packages/lstutorial/build/lstutorial.js b/assets/packages/lstutorial/build/lstutorial.js
@@ -1255,7 +1255,8 @@ const globalTourObject = function(){
             return new Promise((resolve, reject)=>{
                 $.ajax({
                     url: filterUrl('/tutorial/sa/serveprebuilt'),
-                    data: {tutorialname: tourName},
+                    data: {tutorialname: tourName, ajax: true},
+                    method: 'POST',
                     success: (tutorialData)=>{
                         const tutorialObject = _prepareMethods(tutorialData.tutorial);
                         resolve(tutorialObject);

diff --git a/assets/packages/lstutorial/build/lstutorial.js.map b/assets/packages/lstutorial/build/lstutorial.js.map
diff --git a/assets/packages/lstutorial/build/lstutorial.min.js b/assets/packages/lstutorial/build/lstutorial.min.js
diff --git a/assets/packages/lstutorial/src/tours/global-tour-object.js b/assets/packages/lstutorial/src/tours/global-tour-object.js
@@ -53,7 +53,8 @@ const globalTourObject = function(){
             return new Promise((resolve, reject)=>{
                 $.ajax({
                     url: filterUrl('/tutorial/sa/serveprebuilt'),
-                    data: {tutorialname: tourName},
+                    data: {tutorialname: tourName, ajax: true},
+                    method: 'POST',
                     success: (tutorialData)=>{
                         const tutorialObject = _prepareMethods(tutorialData.tutorial);
                         resolve(tutorialObject);