aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2025-06-06 13:38:11 +0200
committerGitHub <noreply@github.com>2025-06-06 13:38:11 +0200
commit89f25419f0ab0175edc6f1000c2010b2b1c834a6 (patch)
tree9b91f104ec4657aa5f6be85fbbf425c67f108a73
parent9a0e72e597caa49fc6dfaac4a3c3463efd7b1a97 (diff)
downloadnextcloud-server-fix/users-gid.tar.gz
nextcloud-server-fix/users-gid.zip
fix(settings): adjust group return code stylingfix/users-gid
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 b9034155b32..f5b62f7f904 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(', ')
},