From 3ae56e9aa8430e5ac3e0aadcbc2bbc1371848508 Mon Sep 17 00:00:00 2001
From: Marcus Eibrink-Lunzenauer <lunzenauer@elan-ev.de>
Date: Tue, 30 Nov 2021 06:01:28 +0100
Subject: [PATCH] Fix `base` of Courseware's Vue router.
Closes #279.
---
.../vue/components/courseware/CoursewareLinkBlock.vue | 2 +-
resources/vue/courseware-index-app.js | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/resources/vue/components/courseware/CoursewareLinkBlock.vue b/resources/vue/components/courseware/CoursewareLinkBlock.vue
index 02922d3eadd..c20ef10c5f7 100755
--- a/resources/vue/components/courseware/CoursewareLinkBlock.vue
+++ b/resources/vue/components/courseware/CoursewareLinkBlock.vue
@@ -17,7 +17,7 @@
</a>
</div>
<div v-if="currentType === 'internal'">
- <router-link :to="'/structural_element/' + currentTarget">
+ <router-link :to="{ name: 'CoursewareStructuralElement', params: { id: currentTarget } }">
<div class="cw-link internal">
<span class="cw-link-title">
{{ currentTitle }}
diff --git a/resources/vue/courseware-index-app.js b/resources/vue/courseware-index-app.js
index 2ecb252c6d2..a72437970a3 100755
--- a/resources/vue/courseware-index-app.js
+++ b/resources/vue/courseware-index-app.js
@@ -71,9 +71,14 @@ const mountApp = (STUDIP, createApp, element) => {
},
];
+ let pathname = new URL(STUDIP.ABSOLUTE_URI_STUDIP).pathname;
+ if (pathname.endsWith('/')) {
+ pathname = pathname + '/';
+ }
const base = STUDIP.URLHelper.parameters.cid
- ? STUDIP.URLHelper.getURL('dispatch.php/course/courseware', { cid: STUDIP.URLHelper.parameters.cid }, true)
- : STUDIP.URLHelper.getURL('dispatch.php/contents/courseware/courseware');
+ ? `${pathname}dispatch.php/course/courseware/?cid=${STUDIP.URLHelper.parameters.cid}`
+ : `${pathname}dispatch.php/contents/courseware/courseware`;
+
const router = new VueRouter({
base,
routes,
--
GitLab