Browse Source
Allow to sort groups by name
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/6216/head
Joas Schilling
9 years ago
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with
19 additions and
10 deletions
-
config/config.sample.php
-
settings/users.php
|
|
|
@ -942,6 +942,11 @@ $CONFIG = array( |
|
|
|
*/ |
|
|
|
'ldapUserCleanupInterval' => 51, |
|
|
|
|
|
|
|
/** |
|
|
|
* Sort groups in the user settings by name instead of the user count |
|
|
|
*/ |
|
|
|
'sort_groups_by_name' => false, |
|
|
|
|
|
|
|
/** |
|
|
|
* Comments |
|
|
|
* |
|
|
|
|
|
|
|
@ -45,19 +45,23 @@ $groupManager = \OC::$server->getGroupManager(); |
|
|
|
// Set the sort option: SORT_USERCOUNT or SORT_GROUPNAME
|
|
|
|
$sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT; |
|
|
|
|
|
|
|
$isLDAPUsed = false; |
|
|
|
if (\OC_App::isEnabled('user_ldap')) { |
|
|
|
$isLDAPUsed = |
|
|
|
$groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP') |
|
|
|
|| $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy'); |
|
|
|
if ($isLDAPUsed) { |
|
|
|
// LDAP user count can be slow, so we sort by group name here
|
|
|
|
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
|
|
$config = \OC::$server->getConfig(); |
|
|
|
|
|
|
|
if ($config->getSystemValue('sort_groups_by_name', false)) { |
|
|
|
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
|
|
} else { |
|
|
|
$isLDAPUsed = false; |
|
|
|
if (\OC_App::isEnabled('user_ldap')) { |
|
|
|
$isLDAPUsed = |
|
|
|
$groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP') |
|
|
|
|| $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy'); |
|
|
|
if ($isLDAPUsed) { |
|
|
|
// LDAP user count can be slow, so we sort by group name here
|
|
|
|
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
$config = \OC::$server->getConfig(); |
|
|
|
|
|
|
|
$isAdmin = OC_User::isAdminUser(OC_User::getUser()); |
|
|
|
|
|
|
|
$isDisabled = !OC_User::isEnabled(OC_User::getUser()); |
|
|
|
|
