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/templates | |
| 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/templates')
| -rw-r--r-- | settings/templates/users/main.php | 4 | ||||
| -rw-r--r-- | settings/templates/users/part.grouplist.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php index 3fc80fca0b9..2d40f0fbb64 100644 --- a/settings/templates/users/main.php +++ b/settings/templates/users/main.php @@ -21,10 +21,10 @@ style('settings', 'settings'); $userlistParams = array(); $allGroups=array(); foreach($_["adminGroup"] as $group) { - $allGroups[] = $group['name']; + $allGroups[$group['id']] = array('displayName' => $group['name']); } foreach($_["groups"] as $group) { - $allGroups[] = $group['name']; + $allGroups[$group['id']] = array('displayName' => $group['name']); } $userlistParams['subadmingroups'] = $allGroups; $userlistParams['allGroups'] = json_encode($allGroups); diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php index 469ed94adb3..4128a6b76e4 100644 --- a/settings/templates/users/part.grouplist.php +++ b/settings/templates/users/part.grouplist.php @@ -50,7 +50,7 @@ <!--List of Groups--> <?php foreach($_["groups"] as $group): ?> - <li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p($group['usercount']) ?>" class="isgroup"> + <li data-gid="<?php p($group['id']) ?>" data-usercount="<?php p($group['usercount']) ?>" class="isgroup"> <a href="#" class="dorename"> <span class="groupname"><?php p($group['name']); ?></span> </a> |