Fixed issue #17862: Invalid url in admin (usage of HTTP_HOST) (#2282)

Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>
LimeSurvey · Apr 28, 2022 · 9281e80 · 9281e80
1 parent abe8543
commit 9281e80
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/application/views/layouts/sidemenu.php b/application/views/layouts/sidemenu.php
@@ -20,7 +20,7 @@
     $getQuestionsUrl = $this->createUrl("/surveyAdministration/getAjaxQuestionGroupArray/", ["surveyid" => $surveyid]);
     $getMenuUrl = $this->createUrl("/surveyAdministration/getAjaxMenuArray/", ["surveyid" => $surveyid]);
     $createQuestionGroupLink = $this->createUrl('/questionGroupsAdministration/add/' , ["surveyid" => $surveyid]);
-    $createQuestionLink = "questionAdministration/create/surveyid/".$surveyid;
+    $createQuestionLink =  $this->createUrl('questionAdministration/create/' , ["surveyid" => $surveyid]);
     $unlockLockOrganizerUrl = $this->createUrl("admin/user/sa/togglesetting/", ['surveyid' => $surveyid]);
 
     $updateOrderLink =  $this->createUrl("questionGroupsAdministration/updateOrder/", ["surveyid" =>  $surveyid]);

diff --git a/assets/packages/adminsidepanel/build.min/js/adminsidepanel.js b/assets/packages/adminsidepanel/build.min/js/adminsidepanel.js
diff --git a/assets/packages/adminsidepanel/build/js/adminsidepanel.js b/assets/packages/adminsidepanel/build/js/adminsidepanel.js
diff --git a/assets/packages/adminsidepanel/src/components/subcomponents/_questionsgroups.vue b/assets/packages/adminsidepanel/src/components/subcomponents/_questionsgroups.vue
@@ -64,10 +64,11 @@ export default {
             this.active = [];
         },
         createFullQuestionLink() { 
-            if(LS.reparsedParameters().combined.gid) {
-                return LS.createUrl(this.createQuestionLink, {gid: LS.reparsedParameters().combined.gid}); 
+            if (LS.reparsedParameters().combined.gid) {
+                return this.createQuestionLink + '&gid=' + LS.reparsedParameters().combined.gid;
+            } else {
+                return this.createQuestionLink;
             }
-            return LS.createUrl(this.createQuestionLink, {}); 
         },
         questionHasCondition(question) {
             return question.relevance !== '1';