Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-8030 - KNL F5: POC Dateien im Team (und Kurs) neu zuordnen #3603

Merged
merged 2 commits into from
Mar 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions controllers/teams.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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,
},
Expand Down
1 change: 0 additions & 1 deletion locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion locales/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -1941,7 +1941,6 @@
"reallyWantToRmUser": "Ви впевнені, що хочете вилучити цього учасника?",
"removeClass": "Вилучити клас",
"removeUser": "Вилучити користувача",
"leaveTeamWFilesIntro": "Ви залишаєте команду. Всі файли, пов'язані з вами, також будуть видалені. Якщо ви не хочете втратити ці файли, скопіюйте їх перед звільненням.",
"roleOfInvitedTeacher": "Роль запрошеного викладача",
"selectRoleForMember": "Введіть роль, яку потрібно надати учаснику.",
"sendInvitationAgain": "Повторно відправити запрошення",
Expand Down
16 changes: 0 additions & 16 deletions static/scripts/teams.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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');
});

Expand Down
6 changes: 1 addition & 5 deletions views/teams/forms/form-leave-team.hbs
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion views/teams/team.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
Loading