Skip to content

Commit ee1cc4c

Browse files
skjnldsvsusnux
authored andcommitted
fix(settings): adjust group return code styling
Co-authored-by: Ferdinand Thiessen <[email protected]> Signed-off-by: John Molakvoæ <[email protected]>
1 parent 22b69bb commit ee1cc4c

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
@@ -422,10 +422,7 @@ export default {
422422
.map(group => {
423423
// Try to match with more extensive group data
424424
const availableGroup = this.availableGroups.find(g => g.id === group.id)
425-
if (availableGroup) {
426-
return availableGroup.name ?? availableGroup.id
427-
}
428-
return group.name ?? group.id
425+
return availableGroup.name ?? group.name ?? group.id
429426
})
430427
.join(', ')
431428
},
@@ -435,10 +432,7 @@ export default {
435432
.map(group => {
436433
// Try to match with more extensive group data
437434
const availableGroup = this.availableSubAdminGroups.find(g => g.id === group.id)
438-
if (availableGroup) {
439-
return availableGroup.name ?? availableGroup.id
440-
}
441-
return group.name ?? group.id
435+
return availableGroup.name ?? group.name ?? group.id
442436
})
443437
.join(', ')
444438
},

0 commit comments

Comments
 (0)