aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2025-06-06 13:38:11 +0200
committerskjnldsv <skjnldsv@protonmail.com>2025-06-12 21:19:38 +0200
commitdc59cfcad4e4201006a119661d413223bdf89fdb (patch)
tree10c925258681d18c03deb1e46bd2c71f7affd728
parent658bd5c6c54bf25b944da78f8a77746362f02720 (diff)
downloadnextcloud-server-backport/53363/stable31.tar.gz
nextcloud-server-backport/53363/stable31.zip
fix(settings): adjust group return code stylingbackport/53363/stable31
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de> Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
-rw-r--r--apps/settings/src/components/Users/UserRow.vue10
1 files 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(', ')
},