From 3d2c00a4825a0032aa9adf827ac1b26b94d71009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Fri, 6 Jun 2025 13:38:11 +0200 Subject: [PATCH] fix(settings): adjust group return code styling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ferdinand Thiessen Signed-off-by: John Molakvoæ --- apps/settings/src/components/Users/UserRow.vue | 10 ++-------- 1 file 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(', ') },