Skip to content

Commit 1429fcd

Browse files
LrxGaelleNicolasRichel
authored andcommitted
PATCH: fix user role badge & show action menu (#611)
1 parent f9e9b70 commit 1429fcd

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/components/specific/users/user-card/UserCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export default {
9595
const { isSelf, isSpaceAdmin, isProjectAdmin } = useUser();
9696
9797
const showActionMenu = computed(() => {
98-
return !isSelf(props.user) && !isSpaceAdmin(props.space) && isProjectAdmin(props.project) && props.user.cloud_role !== 100;
98+
return !isSelf(props.user) && isSpaceAdmin(props.space) || !isSelf(props.user) && isProjectAdmin(props.project) && props.user.cloud_role !== 100;
9999
});
100100
const role = computed(() => (props.project ? props.user.role : props.user.cloud_role));
101101
const cloudRole = computed(() => props.user.cloud_role);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<template v-if="roleName === 'guest'">
44
{{ $t("UserRoleBadge.guest") }}
55
</template>
6-
<template v-if="cloudRole === 100 && projectRole === 100">
6+
<template v-if="cloudRole === 100">
77
{{ $t(`UserRoleBadge.spaceAdmin`) }}
88
</template>
99
<template v-if="cloudRole !== 100 && projectRole === 100">

0 commit comments

Comments
 (0)