aboutsummaryrefslogtreecommitdiffstats
path: root/apps/settings/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings/src/components')
-rw-r--r--apps/settings/src/components/Users/UserRow.vue12
1 files changed, 10 insertions, 2 deletions
diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue
index d17d684efb4..f5b62f7f904 100644
--- a/apps/settings/src/components/Users/UserRow.vue
+++ b/apps/settings/src/components/Users/UserRow.vue
@@ -425,13 +425,21 @@ export default {
userGroupsLabels() {
return this.userGroups
- .map(group => group.name ?? group.id)
+ .map(group => {
+ // Try to match with more extensive group data
+ const availableGroup = this.availableGroups.find(g => g.id === group.id)
+ return availableGroup.name ?? group.name ?? group.id
+ })
.join(', ')
},
userSubAdminGroupsLabels() {
return this.userSubAdminGroups
- .map(group => group.name ?? group.id)
+ .map(group => {
+ // Try to match with more extensive group data
+ const availableGroup = this.availableSubAdminGroups.find(g => g.id === group.id)
+ return availableGroup.name ?? group.name ?? group.id
+ })
.join(', ')
},