diff --git a/client/src/pages/mediaLibrary/MLMediaListPage.vue b/client/src/pages/mediaLibrary/MLMediaListPage.vue index dd9f3f4a..645ad84a 100644 --- a/client/src/pages/mediaLibrary/MLMediaListPage.vue +++ b/client/src/pages/mediaLibrary/MLMediaListPage.vue @@ -5,11 +5,11 @@ import * as log from "loglevel"; import { computed } from "vue"; const props = defineProps<{ - mediaLibraryPageSlug: string; + courseSlug: string; mediaCategorySlug: string; }>(); -log.debug("MLMediaListPage created", props.mediaCategorySlug); +log.debug("MLMediaListPage created", props.courseSlug); const mediaStore = useMediaLibraryStore(); diff --git a/client/src/pages/mediaLibrary/MLParentPage.vue b/client/src/pages/mediaLibrary/MLParentPage.vue index e2dd62a2..a3cb202d 100644 --- a/client/src/pages/mediaLibrary/MLParentPage.vue +++ b/client/src/pages/mediaLibrary/MLParentPage.vue @@ -6,16 +6,16 @@ import { onMounted } from "vue"; log.debug("MediaLibraryView created"); const props = defineProps<{ - mediaLibraryPageSlug: string; + courseSlug: string; }>(); const mediaLibraryStore = useMediaLibraryStore(); onMounted(async () => { - log.debug("MediaLibraryView mounted", props.mediaLibraryPageSlug); + log.debug("MediaLibraryView mounted", props.courseSlug); try { - await mediaLibraryStore.loadMediaLibraryPage(props.mediaLibraryPageSlug); + await mediaLibraryStore.loadMediaLibraryPage(`${props.courseSlug}-media`); } catch (error) { log.error(error); } diff --git a/client/src/router/index.ts b/client/src/router/index.ts index ae638191..f1d89417 100644 --- a/client/src/router/index.ts +++ b/client/src/router/index.ts @@ -31,7 +31,7 @@ const router = createRouter({ component: DashboardPage, }, { - path: "/media/:mediaLibraryPageSlug", + path: "/course/:courseSlug/media", props: true, component: () => import("@/pages/mediaLibrary/MLParentPage.vue"), children: [ diff --git a/server/vbv_lernwelt/media_library/models.py b/server/vbv_lernwelt/media_library/models.py index 5ce5a8d3..72923c43 100644 --- a/server/vbv_lernwelt/media_library/models.py +++ b/server/vbv_lernwelt/media_library/models.py @@ -31,7 +31,7 @@ class MediaLibraryPage(CourseBasePage): super(MediaLibraryPage, self).save(clean, user, log_action, **kwargs) def get_frontend_url(self): - return f"/media/{self.slug}" + return f"/course/{self.slug.replace('-media', '')}/media" class MediaCategoryPage(CourseBasePage): @@ -95,7 +95,7 @@ class MediaCategoryPage(CourseBasePage): def get_frontend_url(self): r = re.compile(r"^(?P.+?)-media-cat-(?P.+)$") m = r.match(self.slug) - return f"/media/{m.group('coursePart')}-media/category/{m.group('catPart')}" + return f"/course/{m.group('coursePart')}/media/category/{m.group('catPart')}" class LibraryDocument(AbstractDocument):