wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show disabled even if empty if ldap enabled

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-11-06 10:53:40 +01:00
parent 54a30a4b81
commit 9f532df1a4
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
settings/Controller/UsersController.php
View file

@ -192,7 +192,7 @@ class UsersController extends Controller {
} }
if ($this->isAdmin) { if ($this->isAdmin) {
$disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsers(); $disabledUsers = $isLDAPUsed ? -1 : $this->userManager->countDisabledUsers();
$userCount = $isLDAPUsed ? 0 : array_reduce($this->userManager->countUsers(), function($v, $w) { $userCount = $isLDAPUsed ? 0 : array_reduce($this->userManager->countUsers(), function($v, $w) {
return $v + (int)$w; return $v + (int)$w;
}, 0); }, 0);
@ -214,7 +214,7 @@ class UsersController extends Controller {
} }
}; };
$userCount += $isLDAPUsed ? 0 : $this->userManager->countUsersOfGroups($groupsInfo->getGroups()); $userCount += $isLDAPUsed ? 0 : $this->userManager->countUsersOfGroups($groupsInfo->getGroups());
$disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsersOfGroups($groupsNames); $disabledUsers = $isLDAPUsed ? -1 : $this->userManager->countDisabledUsersOfGroups($groupsNames);
} }
$disabledUsersGroup = [ $disabledUsersGroup = [
'id' => 'disabled', 'id' => 'disabled',

11
settings/src/views/Users.vue
View file

@ -315,8 +315,8 @@ export default {
// group name // group name
item.text = group.name; item.text = group.name;
// users count // users count for all groups
if (group.usercount - group.disabled > 0) { if (group.usercount - group.disabled > 0 || group.usercount === -1) {
item.utils.counter = group.usercount - group.disabled; item.utils.counter = group.usercount - group.disabled;
} }
@ -363,8 +363,11 @@ export default {
if (disabledGroup && disabledGroup.text) { if (disabledGroup && disabledGroup.text) {
disabledGroup.text = t('settings', 'Disabled users'); // rename disabled group disabledGroup.text = t('settings', 'Disabled users'); // rename disabled group
disabledGroup.icon = 'icon-disabled-users'; // set icon disabledGroup.icon = 'icon-disabled-users'; // set icon
if (disabledGroup.utils && disabledGroup.utils.counter > 0) { if (disabledGroup.utils && (
groups.unshift(disabledGroup); // add disabled if not empty disabledGroup.utils.counter > 0 // add disabled if not empty
|| disabledGroup.utils.counter === -1) // add disabled if ldap enabled
) {
groups.unshift(disabledGroup);
} }
} }