Skip to content

Commit 77060dd

Browse files
skjnldsvsusnux
authored andcommitted
fix(settings): adjust group return code styling
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de> Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
1 parent 658bd5c commit 77060dd

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,7 @@ export default {
428428
.map(group => {
429429
// Try to match with more extensive group data
430430
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
431+
return availableGroup.name ?? group.name ?? group.id
435432
})
436433
.join(', ')
437434
},
@@ -441,10 +438,7 @@ export default {
441438
.map(group => {
442439
// Try to match with more extensive group data
443440
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
441+
return availableGroup.name ?? group.name ?? group.id
448442
})
449443
.join(', ')
450444
},

0 commit comments

Comments
 (0)