Skip to content

Commit 658bd5c

Browse files
skjnldsvbackportbot[bot]
authored andcommitted
fix(settings): show group label instead of gid in accounts management
Signed-off-by: skjnldsv <[email protected]>
1 parent 5cddf5a commit 658bd5c

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

apps/settings/src/components/Users/UserRow.vue

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,13 +425,27 @@ export default {
425425
426426
userGroupsLabels() {
427427
return this.userGroups
428-
.map(group => group.name ?? group.id)
428+
.map(group => {
429+
// Try to match with more extensive group data
430+
const availableGroup = this.availableGroups.find(g => g.id === group.id)
431+
if (availableGroup) {
432+
return availableGroup.name ?? availableGroup.id
433+
}
434+
return group.name ?? group.id
435+
})
429436
.join(', ')
430437
},
431438
432439
userSubAdminGroupsLabels() {
433440
return this.userSubAdminGroups
434-
.map(group => group.name ?? group.id)
441+
.map(group => {
442+
// Try to match with more extensive group data
443+
const availableGroup = this.availableSubAdminGroups.find(g => g.id === group.id)
444+
if (availableGroup) {
445+
return availableGroup.name ?? availableGroup.id
446+
}
447+
return group.name ?? group.id
448+
})
435449
.join(', ')
436450
},
437451

0 commit comments

Comments
 (0)