From 4674ad5da5f7319c025f3c1ba81199d501055ab2 Mon Sep 17 00:00:00 2001 From: Martin Schuhmacher <55735359+MartinSchuhmacher@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:35:12 +0100 Subject: [PATCH] BC-8030 - KNL F5: POC Dateien im Team (und Kurs) neu zuordnen (#3603) * removing file info when leaving team --- controllers/teams.js | 5 ----- locales/de.json | 1 - locales/en.json | 1 - locales/es.json | 1 - locales/uk.json | 1 - static/scripts/teams.js | 16 ---------------- views/teams/forms/form-leave-team.hbs | 6 +----- views/teams/team.hbs | 2 +- 8 files changed, 2 insertions(+), 31 deletions(-) diff --git a/controllers/teams.js b/controllers/teams.js index cf7833f5bc..8fa876266f 100644 --- a/controllers/teams.js +++ b/controllers/teams.js @@ -569,10 +569,6 @@ router.get('/:teamId', async (req, res, next) => { }) .slice(0, 6); - const userFiles = JSON.stringify({ - files: files.filter((file) => file.creator === res.locals.currentUser._id).map((file) => file.name), - }); - const news = await api(req, { version: 'v3' }) .get(`/team/${req.params.teamId}/news`, { qs: { @@ -687,7 +683,6 @@ router.get('/:teamId', async (req, res, next) => { course.times, ), userId: res.locals.currentUser._id, - userFiles, teamId: req.params.teamId, rocketChatURL: rocketChatCompleteURL, }, diff --git a/locales/de.json b/locales/de.json index 70a5372c5f..3536eab481 100644 --- a/locales/de.json +++ b/locales/de.json @@ -2998,7 +2998,6 @@ "reallyWantToRmUser": "Möchtest du diese/n Teilnehmer:in wirklich entfernen?", "removeClass": "Klasse entfernen", "removeUser": "Nutzer:in entfernen", - "leaveTeamWFilesIntro": "Sie werden das Team verlassen. Alle Dateien, die mit Ihnen verknüpft sind, werden ebenfalls entfernt. Wenn Sie diese Dateien nicht verlieren wollen, kopieren Sie sie vor dem Verlassen.", "roleOfInvitedTeacher": "Rolle der eingeladenen Lehrkraft", "selectRoleForMember": "Gib ein, welche Rolle der/die Teilnehmer:in erhalten soll.", "sendInvitationAgain": "Einladung erneut versenden" diff --git a/locales/en.json b/locales/en.json index 8cc099587e..da4340f23b 100644 --- a/locales/en.json +++ b/locales/en.json @@ -2998,7 +2998,6 @@ "reallyWantToRmUser": "Do you really want to remove this attendee?", "removeClass": "Remove class", "removeUser": "Remove user", - "leaveTeamWFilesIntro": "You are going to leave team. All files linked to that you will also be removed. If you don't want to lose these files, copy them before leave.", "roleOfInvitedTeacher": "Role of the invited teacher", "selectRoleForMember": "Enter which role the attendee should be given.", "sendInvitationAgain": "Resend invitation" diff --git a/locales/es.json b/locales/es.json index 41ff11c7bc..5d73913cfb 100644 --- a/locales/es.json +++ b/locales/es.json @@ -2998,7 +2998,6 @@ "reallyWantToRmUser": "¿Estás seguro de que deseas eliminar a este asistente?", "removeClass": "Eliminar clase", "removeUser": "Eliminar usuario", - "leaveTeamWFilesIntro": "Vas a dejar el equipo. Todos los archivos vinculados a que también se eliminará. Si usted no quiere perder estos archivos, copiarlos antes de salir.", "roleOfInvitedTeacher": "Rol del profesor invitado", "selectRoleForMember": "Introduce el rol que se le debe dar al asistente.", "sendInvitationAgain": "Reenviar invitación" diff --git a/locales/uk.json b/locales/uk.json index 5d41593fa7..57cae930b8 100644 --- a/locales/uk.json +++ b/locales/uk.json @@ -1941,7 +1941,6 @@ "reallyWantToRmUser": "Ви впевнені, що хочете вилучити цього учасника?", "removeClass": "Вилучити клас", "removeUser": "Вилучити користувача", - "leaveTeamWFilesIntro": "Ви залишаєте команду. Всі файли, пов'язані з вами, також будуть видалені. Якщо ви не хочете втратити ці файли, скопіюйте їх перед звільненням.", "roleOfInvitedTeacher": "Роль запрошеного викладача", "selectRoleForMember": "Введіть роль, яку потрібно надати учаснику.", "sendInvitationAgain": "Повторно відправити запрошення", diff --git a/static/scripts/teams.js b/static/scripts/teams.js index fd3a73c122..b57e52daaf 100644 --- a/static/scripts/teams.js +++ b/static/scripts/teams.js @@ -188,7 +188,6 @@ $(document).ready(() => { e.preventDefault(); const $leaveTeamModal = $('.leave-team-modal'); const userId = $(this).data('user-id'); - const { files } = $(this).data('user-files'); populateModalForm($leaveTeamModal, { title: $t('teams._team.headline.leaveTeam'), closeLabel: $t('global.button.cancel'), @@ -197,21 +196,6 @@ $(document).ready(() => { payload: { userId }, }); - const $deleteInfoAlert = $leaveTeamModal.find('.alert'); - const $fileList = $leaveTeamModal.find('.file-list'); - - if (files?.length) { - const fileListHtmlLi = files.map((file) => `
{{$t "teams._team.members.label.leaveTeamWFilesIntro"}}
-