Merge branch 'main' into THR-18-dev-feature-h5p-editor

hpi-schul-cloud · Oct 6, 2023 · fffe080 · fffe080
2 parents fe11f49 + 71a73d4
commit fffe080
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config/documents.js b/config/documents.js
@@ -5,7 +5,9 @@ const { DOCUMENT_BASE_DIR, SC_THEME } = require('./global');
 const specificFiles = {
 	accessibilityStatement: 'Willkommensordner/Barrierefreiheit/Barrierefreiheitserklaerung.pdf',
 	privacyExemplary: 'Onlineeinwilligung/Datenschutzerklaerung-Muster-Schulen-Onlineeinwilligung.pdf',
-	privacy: 'Onlineeinwilligung/Datenschutzerklaerung-Onlineeinwilligung.pdf',
+	privacy: SC_THEME === 'thr'
+		? 'Onlineeinwilligung/Datenschutzhinweise.pdf'
+		: 'Onlineeinwilligung/Datenschutzerklaerung-Onlineeinwilligung.pdf',
 	termsOfUseExemplary: 'Onlineeinwilligung/Nutzungsordnung-HPI-Schule-Schueler-Onlineeinwilligung.pdf',
 	termsOfUse: 'Onlineeinwilligung/Nutzungsordnung-Onlineeinwilligung.pdf',
 	termsOfUseSchool: SC_THEME === 'thr'

diff --git a/controllers/files.js b/controllers/files.js
@@ -707,7 +707,7 @@ router.get('/courses/:courseId/:folderId?', FileGetter, async (req, res, next) =
 		courseId: req.params.courseId,
 		ownerId: req.params.courseId,
 		toCourseText: res.$t('global.button.toCourse'),
-		courseUrl: `/rooms/${req.params.courseId}/`,
+		courseUrl: `/rooms/${req.params.courseId}`,
 		canEditPermissions: true,
 		parentId: req.params.folderId,
 		...res.locals.files,