diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2018-03-15 12:07:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 12:07:30 +0100 |
| commit | 208e38e84e1a07a49699aa90dc5b7272d24489f0 (patch) | |
| tree | 0a136997d2ba16d01c0a9ebc79ad67b550287cf5 /settings/Controller/UsersController.php | |
| parent | fde08a961941323b445f5b5eed10cf25199fb5b4 (diff) | |
| parent | 23a1553539d67f7eb317abd3857640d056853d50 (diff) | |
| download | nextcloud-server-208e38e84e1a07a49699aa90dc5b7272d24489f0.tar.gz nextcloud-server-208e38e84e1a07a49699aa90dc5b7272d24489f0.zip | |
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name
Full implement group display names
Diffstat (limited to 'settings/Controller/UsersController.php')
| -rw-r--r-- | settings/Controller/UsersController.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 956403f143c..c56f0e70604 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -203,10 +203,7 @@ class UsersController extends Controller { $restorePossible = true; } - $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user); - foreach ($subAdminGroups as $key => $subAdminGroup) { - $subAdminGroups[$key] = $subAdminGroup->getGID(); - } + $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroupsName($user); $displayName = $user->getEMailAddress(); if (is_null($displayName)) { @@ -223,7 +220,7 @@ class UsersController extends Controller { return [ 'name' => $user->getUID(), 'displayname' => $user->getDisplayName(), - 'groups' => empty($userGroups) ? $this->groupManager->getUserGroupIds($user) : $userGroups, + 'groups' => empty($userGroups) ? $this->groupManager->getUserGroupNames($user) : $userGroups, 'subadmin' => $subAdminGroups, 'quota' => $user->getQuota(), 'quota_bytes' => Util::computerFileSize($user->getQuota()), @@ -464,7 +461,7 @@ class UsersController extends Controller { } } // fetch users groups - $userGroups = $this->groupManager->getUserGroupIds($user); + $userGroups = $this->groupManager->getUserGroupNames($user); return new DataResponse( $this->formatUserForIndex($user, $userGroups), |