mirror of
https://github.com/nextcloud/server.git
synced 2026-05-28 04:32:30 -04:00
Merge pull request #53509 from nextcloud/backport/53436/stable31
[stable31] fix(UserRow): fallback to group name in case of undefined availableGroup
This commit is contained in:
commit
acab1571df
5 changed files with 8 additions and 8 deletions
|
|
@ -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
4
dist/settings-users-3239.js
vendored
File diff suppressed because one or more lines are too long
2
dist/settings-users-3239.js.map
vendored
2
dist/settings-users-3239.js.map
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue