Fixed issue #13149: Tour does not work when using urlFormat path

LimeSurvey · Jan 9, 2018 · 0f6b387 · 0f6b387
1 parent 4b157d9
commit 0f6b387
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/assets/packages/lstutorial/build/lstutorial.js b/assets/packages/lstutorial/build/lstutorial.js
@@ -18396,7 +18396,7 @@ const globalTourObject = function(){
 
             const baseUrl = (getBasedUrls || forceGet) ? '?r=admin/' : '/admin/';
             const containsIndex = (/\/index.php\/?/.test(window.location.href));
-            const returnUrl = window.LS.data.baseUrl+(containsIndex ? '/index.php' : '/')+baseUrl+url+combineParams(params);
+            const returnUrl = window.LS.data.baseUrl+(containsIndex ? '/index.php' : '')+baseUrl+url+combineParams(params);
 
             return returnUrl;
 

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
@@ -24,7 +24,7 @@ const globalTourObject = function(){
 
             const baseUrl = (getBasedUrls || forceGet) ? '?r=admin/' : '/admin/';
             const containsIndex = (/\/index.php\/?/.test(window.location.href));
-            const returnUrl = window.LS.data.baseUrl+(containsIndex ? '/index.php' : '/')+baseUrl+url+combineParams(params);
+            const returnUrl = window.LS.data.baseUrl+(containsIndex ? '/index.php' : '')+baseUrl+url+combineParams(params);
 
             return returnUrl;