aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/settings/src/components/Users/UserRow.vue10
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue
index 12ffa7f3872..ad1416645cc 100644
--- a/apps/settings/src/components/Users/UserRow.vue
+++ b/apps/settings/src/components/Users/UserRow.vue
@@ -428,10 +428,7 @@ export default {
.map(group => {
// Try to match with more extensive group data
const availableGroup = this.availableGroups.find(g => g.id === group.id)
- if (availableGroup) {
- return availableGroup.name ?? availableGroup.id
- }
- return group.name ?? group.id
+ return availableGroup.name ?? group.name ?? group.id
})
.join(', ')
},
@@ -441,10 +438,7 @@ export default {
.map(group => {
// Try to match with more extensive group data
const availableGroup = this.availableSubAdminGroups.find(g => g.id === group.id)
- if (availableGroup) {
- return availableGroup.name ?? availableGroup.id
- }
- return group.name ?? group.id
+ return availableGroup.name ?? group.name ?? group.id
})
.join(', ')
},