From 4e4ff46325142cda7dcc85e5f7a499135d988bd4 Mon Sep 17 00:00:00 2001 From: skjnldsv Date: Fri, 6 Jun 2025 09:43:28 +0200 Subject: [PATCH] fix(settings): show group label instead of gid in accounts management Signed-off-by: skjnldsv --- apps/settings/src/components/Users/UserRow.vue | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue index 0fe22f2e1c7..78b3e422f65 100644 --- a/apps/settings/src/components/Users/UserRow.vue +++ b/apps/settings/src/components/Users/UserRow.vue @@ -419,13 +419,27 @@ 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) + if (availableGroup) { + return availableGroup.name ?? availableGroup.id + } + return 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) + if (availableGroup) { + return availableGroup.name ?? availableGroup.id + } + return group.name ?? group.id + }) .join(', ') },