Merge branch 'main' into EW-1012

hpi-schul-cloud · Mar 6, 2025 · b2d88c8 · b2d88c8
2 parents f5d7451 + 4674ad5
commit b2d88c8
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1941,7 +1941,6 @@
 					"reallyWantToRmUser": "Ви впевнені, що хочете вилучити цього учасника?",
 					"removeClass": "Вилучити клас",
 					"removeUser": "Вилучити користувача",
-					"leaveTeamWFilesIntro": "Ви залишаєте команду. Всі файли, пов'язані з вами, також будуть видалені. Якщо ви не хочете втратити ці файли, скопіюйте їх перед звільненням.",
 					"roleOfInvitedTeacher": "Роль запрошеного викладача",
 					"selectRoleForMember": "Введіть роль, яку потрібно надати учаснику.",
 					"sendInvitationAgain": "Повторно відправити запрошення",

diff --git 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) => `<li>${file}</li>`).join('');
-
-			$deleteInfoAlert.show();
-			$fileList.show();
-
-			$fileList.html(fileListHtmlLi);
-		} else {
-			$deleteInfoAlert.hide();
-			$fileList.hide();
-		}
-
 		$leaveTeamModal.appendTo('body').modal('show');
 	});
 

diff --git a/views/teams/forms/form-leave-team.hbs b/views/teams/forms/form-leave-team.hbs
@@ -1,8 +1,4 @@
 <div class="form-group">
-    <div class="alert alert-warning-v2 pa-2 mb-4" role="alert" style="display: flex">
-        <i class="fa fa-exclamation-triangle" style="margin: 8px 8px 0 0; color: rgb(255, 131, 17)" aria-hidden="true"></i><p>{{$t "teams._team.members.label.leaveTeamWFilesIntro"}}</p>
-    </div>
-    <ul class="file-list"></ul>
-    <label for="invitation" >{{$t "teams._team.members.label.doYouReallyWantToLeaveTeam"}}</label>
+    <label for="invitation">{{$t "teams._team.members.label.doYouReallyWantToLeaveTeam"}}</label>
     <input type="hidden" name="userToRemove">
 </div>
diff --git a/views/teams/team.hbs b/views/teams/team.hbs
@@ -53,7 +53,7 @@
                 {{#if ../couldLeave}}
                 {{#inArray "LEAVE_TEAM" ../permissions}}
                 <a href="/teams/{{../_id}}/member" class="dropdown-item dropdown-leave-team"
-                    data-user-id="{{../userId}}" data-user-files="{{../userFiles}}" redirect="/teams/">
+                    data-user-id="{{../userId}}" redirect="/teams/">
                     <i class="fa fa-sign-out" aria-hidden="true"></i> {{$t "teams._team.dropdown_menu.link.leaveTeam"}}
                 </a>
                 {{/inArray}}