Skip to content

Commit ec94fef

Browse files
authored
Merge pull request #53410 from nextcloud/backport/53363/stable30
2 parents 331ed95 + 5e69fe0 commit ec94fef

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

apps/settings/src/components/Users/UserRow.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,13 +419,21 @@ export default {
419419
420420
userGroupsLabels() {
421421
return this.userGroups
422-
.map(group => group.name ?? group.id)
422+
.map(group => {
423+
// Try to match with more extensive group data
424+
const availableGroup = this.availableGroups.find(g => g.id === group.id)
425+
return availableGroup.name ?? group.name ?? group.id
426+
})
423427
.join(', ')
424428
},
425429
426430
userSubAdminGroupsLabels() {
427431
return this.userSubAdminGroups
428-
.map(group => group.name ?? group.id)
432+
.map(group => {
433+
// Try to match with more extensive group data
434+
const availableGroup = this.availableSubAdminGroups.find(g => g.id === group.id)
435+
return availableGroup.name ?? group.name ?? group.id
436+
})
429437
.join(', ')
430438
},
431439

dist/settings-users-3239.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-users-3239.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-vue-settings-apps-users-management.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-vue-settings-apps-users-management.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)