From 2c876ea59f3cd1d6f54729b2abb0f97733d27c11 Mon Sep 17 00:00:00 2001 From: Murat Merdoglu <64781656+muratmerdoglu-dp@users.noreply.github.com> Date: Mon, 2 Oct 2023 10:32:33 +0200 Subject: [PATCH 1/2] remove tail slash on url (#3316) BC-4908-remove tail slash on url --- controllers/files.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/files.js b/controllers/files.js index d8b1a3f2dd..218cedec46 100644 --- 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, From 71a73d442cf7fa8ae93f27cfc9a99224b6100201 Mon Sep 17 00:00:00 2001 From: odalys-dataport <82401838+odalys-dataport@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:39:56 +0200 Subject: [PATCH 2/2] BC-4745 - change privacy policy file name for thr/tsc (#3321) --- config/documents.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/documents.js b/config/documents.js index 426d76dbcd..f33ba44644 100644 --- 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'