upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 07:39:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 42

Merge branch 'master' into fix/loading-account-menu

Browse source 
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
This commit is contained in:
John Molakvoæ 2025-06-11 18:17:35 +02:00 committed by GitHub
commit b4b60ed574
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/settings/src/components/Users/UserRow.vue
View file

@ -428,7 +428,7 @@ export default {
.map(group => {
// Try to match with more extensive group data
const availableGroup = this.availableGroups.find(g => g.id === group.id)
return availableGroup.name ?? group.name ?? group.id
return availableGroup?.name ?? group.name ?? group.id
})
.join(', ')
},
@ -438,7 +438,7 @@ export default {
.map(group => {
// Try to match with more extensive group data
const availableGroup = this.availableSubAdminGroups.find(g => g.id === group.id)
return availableGroup.name ?? group.name ?? group.id
return availableGroup?.name ?? group.name ?? group.id
})
.join(', ')
},

4
dist/settings-users-3239.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-users-3239.js.map vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-apps-users-management.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-apps-users-management.js.map vendored
View file

File diff suppressed because one or more lines are too long