From c623b6e35d464ba67fc839e1074ca0398f85f276 Mon Sep 17 00:00:00 2001 From: MarcoAllenspach Date: Mon, 8 Jan 2024 19:37:23 +0100 Subject: [PATCH 1/3] Team: Remove role min required admins --- frontend/src/components/collaborator/CollaboratorForm.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/components/collaborator/CollaboratorForm.vue b/frontend/src/components/collaborator/CollaboratorForm.vue index b68b2af48b..98be323bae 100644 --- a/frontend/src/components/collaborator/CollaboratorForm.vue +++ b/frontend/src/components/collaborator/CollaboratorForm.vue @@ -24,7 +24,6 @@ aria-readonly="true" aria-describedby="readonly" :items="items" - :hint="$tc('components.collaborator.collaboratorForm.roleHint')" persistent-hint item-value="key" item-text="role" @@ -50,7 +49,6 @@ v-model="localCollaboration.role" path="role" :items="items" - :hint="$tc('components.collaborator.collaboratorForm.roleHint')" persistent-hint item-value="key" item-text="role" From 01dadd11e6f986898da3ae703d7a14942b734b8d Mon Sep 17 00:00:00 2001 From: MarcoAllenspach Date: Mon, 8 Jan 2024 19:48:17 +0100 Subject: [PATCH 2/3] remove not used text key --- frontend/src/locales/de.json | 1 - frontend/src/locales/en.json | 1 - frontend/src/locales/fr.json | 1 - frontend/src/locales/it.json | 1 - frontend/src/locales/rm.json | 1 - 5 files changed, 5 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 57a041c035..1967eb4772 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -200,7 +200,6 @@ "title": "Person einladen" }, "collaboratorEdit": { - "cannotAssignAnotherRoleToLastManager": "Du kannst der letzten Person mit administrativen Rechten keine andere Rolle zuteilen.", "cannotRemoveLastManager": "Du kannst die letzte Person mit administrativen Rechten nicht deaktivieren", "deactivate": "Deaktivieren", "delete": "Möchtest du die Person '{name}' wirklich entfernen?", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 01e13d1aab..46aae16e18 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -200,7 +200,6 @@ "title": "Invite people" }, "collaboratorEdit": { - "cannotAssignAnotherRoleToLastManager": "You cannot assign another role to the last person with administrative rights.", "cannotRemoveLastManager": "You cannot remove the last person with administrative rights.", "deactivate": "Deactivate", "delete": "Do you really want to remove collaborator '{name}'?", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index fba510db12..5dee109719 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -185,7 +185,6 @@ "title": "Inviter une personne" }, "collaboratorEdit": { - "cannotAssignAnotherRoleToLastManager": "Tu ne peux pas attribuer un autre rôle au dernier manager.", "cannotRemoveLastManager": "Tu ne peux pas supprimer le dernier manager.", "deactivate": "Désactiver", "delete": "Veux-tu vraiment supprimer la personne '{name}' ?", diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json index d6df2f0d13..773a16c44c 100644 --- a/frontend/src/locales/it.json +++ b/frontend/src/locales/it.json @@ -177,7 +177,6 @@ "title": "Invitare una persona" }, "collaboratorEdit": { - "cannotAssignAnotherRoleToLastManager": "Non puoi assegnare un altro ruolo all'ultimo manager.", "cannotRemoveLastManager": "Non è possibile rimuovere l'ultimo gestore.", "deactivate": "Disattivare", "delete": "Vuoi davvero rimuovere la persona '{name}'?", diff --git a/frontend/src/locales/rm.json b/frontend/src/locales/rm.json index 95e9c1fca2..18863c0377 100644 --- a/frontend/src/locales/rm.json +++ b/frontend/src/locales/rm.json @@ -142,7 +142,6 @@ "title": "Envidar ina persuna" }, "collaboratorEdit": { - "cannotAssignAnotherRoleToLastManager": "Ti na pos betg attribuir in'autra rolla a l'ultima persuna cun dretgs d'administraziun.", "cannotRemoveLastManager": "Ti na pos betg deactivar l'ultima persuna cun dretgs d'administraziun.", "deactivate": "Deactivar", "delete": "Vuls ti propi allontanar la persuna '{name}'?", From bea5a22c2d628c19f68ed49dbe912b9ad42df643 Mon Sep 17 00:00:00 2001 From: Manuel Meister Date: Sun, 14 Apr 2024 15:44:26 +0200 Subject: [PATCH 3/3] Readd hint and remove tooltip --- .../collaborator/CollaboratorForm.vue | 55 ++++++++----------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/frontend/src/components/collaborator/CollaboratorForm.vue b/frontend/src/components/collaborator/CollaboratorForm.vue index 98be323bae..483c814e1f 100644 --- a/frontend/src/components/collaborator/CollaboratorForm.vue +++ b/frontend/src/components/collaborator/CollaboratorForm.vue @@ -11,39 +11,32 @@ - - - {{ $tc('components.collaborator.collaboratorForm.roleHint') }} - -