Merge pull request #3689 from DeNic0la/reuse-display-name-function-#3501

reuse campCollaborationDisplayName according to comment in #3501
ecamp · Aug 14, 2023 · f6ebbbf · f6ebbbf
2 parents 95fa58a + 1c3f097
commit f6ebbbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/frontend/src/components/collaborator/CollaboratorEdit.vue b/frontend/src/components/collaborator/CollaboratorEdit.vue
@@ -130,6 +130,7 @@ import PromptCollaboratorDeactivate from '@/components/collaborator/PromptCollab
 import { errorToMultiLineToast } from '@/components/toast/toasts.js'
 import CollaboratorListItem from '@/components/collaborator/CollaboratorListItem.vue'
 import PromptEntityDelete from '@/components/prompt/PromptEntityDelete.vue'
+import campCollaborationDisplayName from '../../../../common/helpers/campCollaborationDisplayName'
 
 export default {
   name: 'CollaboratorEdit',
@@ -179,9 +180,7 @@ export default {
       return this.$store.state.auth.user?.id === this.collaborator.user().id
     },
     name() {
-      return this.collaborator.user
-        ? this.collaborator.user().displayName
-        : this.collaborator.inviteEmail
+      return campCollaborationDisplayName(this.collaborator, this.$tc.bind(this), false)
     },
   },
   watch: {

diff --git a/frontend/src/components/collaborator/CollaboratorListItem.vue b/frontend/src/components/collaborator/CollaboratorListItem.vue
@@ -41,6 +41,7 @@
 <script>
 import UserAvatar from '@/components/user/UserAvatar.vue'
 import ButtonEdit from '@/components/buttons/ButtonEdit.vue'
+import campCollaborationDisplayName from '../../../../common/helpers/campCollaborationDisplayName'
 
 export default {
   name: 'CollaboratorListItem',
@@ -73,9 +74,7 @@ export default {
   }),
   computed: {
     name() {
-      return this.collaborator.user
-        ? this.collaborator.user().displayName
-        : this.collaborator.inviteEmail
+      return campCollaborationDisplayName(this.collaborator, this.$tc.bind(this), false)
     },
   },
 }