Skip to content

Commit 8162016

Browse files
committed
fix invitations & cloud admin
1 parent bc8c736 commit 8162016

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

src/components/specific/users/space-users-manager/SpaceUsersManager.vue

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<transition-group name="list">
3838
<template v-for="user in displayedUsers">
3939
<InvitationCard
40-
v-if="user.from === 'invitation'"
40+
v-if="user.redirect_uri"
4141
:key="`invitation-${user.id}`"
4242
:space="space"
4343
:invitation="user"
@@ -115,19 +115,13 @@ export default {
115115
116116
const list = computed(() => {
117117
props.invitations.forEach((invitation) => {
118-
invitation.from = "invitation";
118+
invitation.redirect_uri.includes("invitation");
119119
});
120120
if (currentTab.value === "admins") {
121-
admins.value.forEach((invitation) => {
122-
invitation.from = "user";
123-
});
124121
return props.invitations
125122
.filter((invitation) => invitation.role === 100)
126123
.concat(admins.value);
127124
} else {
128-
users.value.forEach((invitation) => {
129-
invitation.from = "user";
130-
});
131125
return props.invitations.filter((invitation) => invitation.role === 50).concat(users.value);
132126
}
133127
});

src/components/specific/users/user-role-badge/UserRoleBadge.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
<template v-if="roleName === 'guest'">
44
{{ $t("UserRoleBadge.guest") }}
55
</template>
6-
<template v-if="isSpaceRole && roleName === 'spaceAdmin'">
6+
<template v-if="role === 100">
77
{{ $t(`UserRoleBadge.spaceAdmin`) }}
88
</template>
9-
<template v-if="!isSpaceRole && roleName === 'projectAdmin'">
10-
{{ $t(`UserRoleBadge.projectAdmin`) }}
11-
</template>
129
<template v-if="isSpaceRole && roleName === 'spaceUser'">
1310
{{ $t(`UserRoleBadge.spaceUser`) }}
1411
</template>

src/i18n/lang/fr.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@
422422
},
423423
"UserRoleBadge": {
424424
"spaceAdmin": "Admin espace",
425-
"projectAdmin": "Admin projet",
426425
"spaceUser": "Utilisateur espace",
427426
"projectUser": "Utilisateur projet",
428427
"guest": "Invité"

0 commit comments

Comments
 (0)