upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-21 17:45:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge pull request #53411 from nextcloud/backport/53363/stable31

Browse source
This commit is contained in:
John Molakvoæ 2025-06-12 22:35:26 +02:00 committed by GitHub
commit 2f3ceecf92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -425,13 +425,21 @@ export default {
userGroupsLabels() {
return this.userGroups
.map(group => group.name ?? group.id)
.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
})
.join(', ')
},
userSubAdminGroupsLabels() {
return this.userSubAdminGroups
.map(group => group.name ?? group.id)
.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
})
.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

4
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