mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hide strange Everyone and Disabled group numbers with LDAP, fixes 17368 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2019-10-07 18:25:29 +02:00
parent c92e64b537
commit b41e3f8f08
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
2 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
apps/settings/lib/Controller/UsersController.php
View File

@ -184,31 +184,38 @@ class UsersController extends Controller {
}); });
} }
if ($this->isAdmin) { $disabledUsers = -1;
$disabledUsers = $isLDAPUsed ? -1 : $this->userManager->countDisabledUsers(); $userCount = 0;
$userCount = $isLDAPUsed ? 0 : array_reduce($this->userManager->countUsers(), function($v, $w) {
return $v + (int)$w;
}, 0);
} else {
// User is subadmin !
// Map group list to names to retrieve the countDisabledUsersOfGroups
$userGroups = $this->groupManager->getUserGroups($user);
$groupsNames = [];
$userCount = 0;
foreach($groups as $key => $group) { if(!$isLDAPUsed) {
// $userCount += (int)$group['usercount']; if ($this->isAdmin) {
array_push($groupsNames, $group['name']); $disabledUsers = $this->userManager->countDisabledUsers();
// we prevent subadmins from looking up themselves $userCount = array_reduce($this->userManager->countUsers(), function($v, $w) {
// so we lower the count of the groups he belongs to return $v + (int)$w;
if (array_key_exists($group['id'], $userGroups)) { }, 0);
$groups[$key]['usercount']--; } else {
$userCount = -1; // we also lower from one the total count // User is subadmin !
} // Map group list to names to retrieve the countDisabledUsersOfGroups
}; $userGroups = $this->groupManager->getUserGroups($user);
$userCount += $isLDAPUsed ? 0 : $this->userManager->countUsersOfGroups($groupsInfo->getGroups()); $groupsNames = [];
$disabledUsers = $isLDAPUsed ? -1 : $this->userManager->countDisabledUsersOfGroups($groupsNames);
foreach($groups as $key => $group) {
// $userCount += (int)$group['usercount'];
array_push($groupsNames, $group['name']);
// we prevent subadmins from looking up themselves
// so we lower the count of the groups he belongs to
if (array_key_exists($group['id'], $userGroups)) {
$groups[$key]['usercount']--;
$userCount -= 1; // we also lower from one the total count
}
};
$userCount += $this->userManager->countUsersOfGroups($groupsInfo->getGroups());
$disabledUsers = $this->userManager->countDisabledUsersOfGroups($groupsNames);
}
$userCount -= $disabledUsers;
} }
$disabledUsersGroup = [ $disabledUsersGroup = [
'id' => 'disabled', 'id' => 'disabled',
'name' => 'Disabled users', 'name' => 'Disabled users',
@ -237,7 +244,7 @@ class UsersController extends Controller {
$serverData['isAdmin'] = $this->isAdmin; $serverData['isAdmin'] = $this->isAdmin;
$serverData['sortGroups'] = $sortGroupsBy; $serverData['sortGroups'] = $sortGroupsBy;
$serverData['quotaPreset'] = $quotaPreset; $serverData['quotaPreset'] = $quotaPreset;
$serverData['userCount'] = $userCount - $disabledUsers; $serverData['userCount'] = $userCount;
$serverData['languages'] = $languages; $serverData['languages'] = $languages;
$serverData['defaultLanguage'] = $this->config->getSystemValue('default_language', 'en'); $serverData['defaultLanguage'] = $this->config->getSystemValue('default_language', 'en');
// Settings // Settings

4
apps/settings/src/views/Users.vue
View File

@ -283,6 +283,10 @@ export default {
|| disabledGroup.utils.counter === -1) // add disabled if ldap enabled || disabledGroup.utils.counter === -1) // add disabled if ldap enabled
) { ) {
groups.unshift(disabledGroup) groups.unshift(disabledGroup)
if (disabledGroup.utils.counter === -1) {
// hides the counter instead of showing -1
delete disabledGroup.utils.counter
}
} }
} }