Merge pull request #4405 from MarcoAllenspach/fix-#3499

Fix #3499
ecamp · Apr 14, 2024 · 2aaedfa · 2aaedfa
2 parents e5739b2 + bea5a22
commit 2aaedfa
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 38 deletions.
diff --git a/frontend/src/components/collaborator/CollaboratorForm.vue b/frontend/src/components/collaborator/CollaboratorForm.vue
@@ -11,46 +11,37 @@
         <slot name="statusChange" />
       </template>
     </e-text-field>
-    <v-tooltip v-if="readonlyRole" eager bottom>
-      <span id="readonly">
-        {{ $tc('components.collaborator.collaboratorForm.roleHint') }}
-      </span>
-      <template #activator="{ on }">
-        <div tabindex="0" class="mt-3" v-on="on">
-          <e-select
-            v-model="localCollaboration.role"
-            path="role"
-            readonly
-            aria-readonly="true"
-            aria-describedby="readonly"
-            :items="items"
-            :hint="$tc('components.collaborator.collaboratorForm.roleHint')"
-            persistent-hint
-            item-value="key"
-            item-text="role"
-            vee-rules="required"
+    <e-select
+      v-if="readonlyRole"
+      v-model="localCollaboration.role"
+      path="role"
+      readonly
+      aria-readonly="true"
+      aria-describedby="readonly"
+      :items="items"
+      :hint="$tc('components.collaborator.collaboratorForm.roleHint')"
+      persistent-hint
+      item-value="key"
+      item-text="role"
+      vee-rules="required"
+    >
+      <template #selection="{ item }">
+        <span
+          >{{ item.role }} &middot;
+          <span class="grey--text"
+            ><template v-for="icon in item.icons"
+              ><v-icon :key="icon" x-small>{{ icon }}</v-icon
+              >&thinsp;</template
+            ></span
           >
-            <template #selection="{ item }">
-              <span
-                >{{ item.role }} &middot;
-                <span class="grey--text"
-                  ><template v-for="icon in item.icons"
-                    ><v-icon :key="icon" x-small>{{ icon }}</v-icon
-                    >&thinsp;</template
-                  ></span
-                >
-              </span>
-            </template>
-          </e-select>
-        </div>
+        </span>
       </template>
-    </v-tooltip>
+    </e-select>
     <e-select
       v-else
       v-model="localCollaboration.role"
       path="role"
       :items="items"
-      :hint="$tc('components.collaborator.collaboratorForm.roleHint')"
       persistent-hint
       item-value="key"
       item-text="role"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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}'?",