Fixed issue #13790: End-URL redfirect is not working in AJAX mode

LimeSurvey · Jun 22, 2018 · 26cfe78 · 26cfe78 · Shnoulle · Jun 23, 2018
1 parent efc651f
commit 26cfe78
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 14 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -1183,8 +1183,17 @@ private function moveSubmitIfNeeded()
 
 
             if (isset($this->aSurveyInfo['autoredirect']) && $this->aSurveyInfo['autoredirect'] == "Y" && $this->aSurveyInfo['surveyls_url']) {
-                //Automatically redirect the page to the "url" setting for the survey
-                header("Location: {$this->aSurveyInfo['surveyls_url']}");
+                if(json_decode($this->oTemplate->options)->ajaxmode == 'on') {
+                    echo '{
+                        "redirectTo" : "'.$this->aSurveyInfo['surveyls_url'].'"
+                    }';
+                    killSurveySession($this->iSurveyid);
+                    Yii::app()->end();
+                    return;
+                } else {
+                    //Automatically redirect the page to the "url" setting for the survey
+                    header("Location: {$this->aSurveyInfo['surveyls_url']}");
+                }
             }
 
             $this->aSurveyInfo['aLEM']['debugvalidation']['show'] = false;
@@ -1207,6 +1216,7 @@ private function moveSubmitIfNeeded()
             if ($this->aSurveyInfo['printanswers'] != 'Y') {
                 killSurveySession($this->iSurveyid);
             }
+
             $this->aSurveyInfo['include_content'] = 'submit';
             Yii::app()->twigRenderer->renderTemplateFromFile("layout_global.twig", array('oSurvey'=> Survey::model()->findByPk($this->iSurveyid), 'aSurveyInfo'=>$this->aSurveyInfo), false);
         }

diff --git a/assets/packages/pjax/min/pjax.combined.min.js b/assets/packages/pjax/min/pjax.combined.min.js
diff --git a/assets/packages/pjax/min/pjax.min.js b/assets/packages/pjax/min/pjax.min.js
diff --git a/assets/packages/pjax/pjax.js b/assets/packages/pjax/pjax.js
diff --git a/themes/survey/vanilla/scripts/ajaxify.js b/themes/survey/vanilla/scripts/ajaxify.js
@@ -81,14 +81,32 @@ var AjaxSubmitObject = function () {
         }
     };
 
+
+
+
     var bindActions = function () {
+        var logFunction = new ConsoleShim('PJAX-LOG', (LSvar.debugMode < 1));
+        var jsonFound = false;
+        var onJsonDocument = function(jsonDocument){
+            logFunction.log("Found JSON document ->", jsonDocument);
+            if(jsonDocument.redirectTo !== undefined) {
+                jsonFound = true;
+                window.location.replace(jsonDocument.redirectTo);
+            }
+        };
+        var onDomDiffers = function(oldDom, newDom){
+            return !jsonFound;
+        }
+
         var globalPjax = new Pjax({
             elements: ['form#limesurvey'], // default is "a[href], form[action]"
             selectors: ['#dynamicReloadContainer', '#beginScripts', '#bottomScripts'],
             debug: true,
             forceRedirectOnFail: true,
+            onJsonDocument: onJsonDocument,
+            onDomDiffers: onDomDiffers,
             reRenderCSS : true,
-            logObject : new ConsoleShim('PJAX-LOG', (LSvar.debugMode < 1)),
+            logObject : logFunction,
             scriptloadtimeout: 1500,
         });
         // Always bind to document to not need to bind again