diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-08 12:11:22 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-08 12:11:22 +0200 |
| commit | f051b7381ba00d538dd5ad0b1ba5b016d4aa62b1 (patch) | |
| tree | 1ad3f14faa57dcdff8198f30ace4a5ed4f396c59 /settings | |
| parent | 2fb1b0864adea92102d8c91d92681dc0ef0bbafc (diff) | |
| parent | d683752b37dd2ed40cddbc446e326015b3036ad3 (diff) | |
| download | nextcloud-server-f051b7381ba00d538dd5ad0b1ba5b016d4aa62b1.tar.gz nextcloud-server-f051b7381ba00d538dd5ad0b1ba5b016d4aa62b1.zip | |
Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount
Sort user groups by group name and hide the user count
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/controller/groupscontroller.php | 2 | ||||
| -rw-r--r-- | settings/js/users/groups.js | 3 | ||||
| -rw-r--r-- | settings/users.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/settings/controller/groupscontroller.php b/settings/controller/groupscontroller.php index 1624b9e28ac..c3c0ea5ff20 100644 --- a/settings/controller/groupscontroller.php +++ b/settings/controller/groupscontroller.php @@ -76,7 +76,7 @@ class GroupsController extends Controller { $groupsInfo = new \OC\Group\MetaData($this->userSession->getUser()->getUID(), $this->isAdmin, $this->groupManager); - $groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT); + $groupsInfo->setSorting($groupsInfo::SORT_GROUPNAME); list($adminGroups, $groups) = $groupsInfo->get($groupPattern, $pattern); return new DataResponse( diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js index 32ddbf3ba01..0fcca39843f 100644 --- a/settings/js/users/groups.js +++ b/settings/js/users/groups.js @@ -271,7 +271,8 @@ GroupList = { $(document).ready( function () { $userGroupList = $('#usergrouplist'); GroupList.initDeleteHandling(); - GroupList.getEveryoneCount(); + // TODO: disabled due to performance issues + // GroupList.getEveryoneCount(); // Display or hide of Create Group List Element $('#newgroup-form').hide(); diff --git a/settings/users.php b/settings/users.php index 0fc9fbeafc2..44e2548be72 100644 --- a/settings/users.php +++ b/settings/users.php @@ -42,7 +42,7 @@ $config = \OC::$server->getConfig(); $isAdmin = OC_User::isAdminUser(OC_User::getUser()); $groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager); -$groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT); +$groupsInfo->setSorting($groupsInfo::SORT_GROUPNAME); list($adminGroup, $groups) = $groupsInfo->get(); $recoveryAdminEnabled = OC_App::isEnabled('encryption') && |