Skip to content

Commit 86b027d

Browse files
authored
Merge pull request #53363 from nextcloud/fix/users-gid
2 parents fadda8c + 5d69596 commit 86b027d

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
@@ -425,13 +425,21 @@ export default {
425425
426426
userGroupsLabels() {
427427
return this.userGroups
428-
.map(group => group.name ?? group.id)
428+
.map(group => {
429+
// Try to match with more extensive group data
430+
const availableGroup = this.availableGroups.find(g => g.id === group.id)
431+
return availableGroup.name ?? group.name ?? group.id
432+
})
429433
.join(', ')
430434
},
431435
432436
userSubAdminGroupsLabels() {
433437
return this.userSubAdminGroups
434-
.map(group => group.name ?? group.id)
438+
.map(group => {
439+
// Try to match with more extensive group data
440+
const availableGroup = this.availableSubAdminGroups.find(g => g.id === group.id)
441+
return availableGroup.name ?? group.name ?? group.id
442+
})
435443
.join(', ')
436444
},
437445

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)