Browse Source
Show disabled even if empty if ldap enabled
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
pull/12306/head
John Molakvoæ (skjnldsv)
7 years ago
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
2 changed files with
9 additions and
6 deletions
-
settings/Controller/UsersController.php
-
settings/src/views/Users.vue
|
|
|
@ -192,7 +192,7 @@ class UsersController extends Controller { |
|
|
|
} |
|
|
|
|
|
|
|
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) { |
|
|
|
return $v + (int)$w; |
|
|
|
}, 0); |
|
|
|
@ -214,7 +214,7 @@ class UsersController extends Controller { |
|
|
|
} |
|
|
|
}; |
|
|
|
$userCount += $isLDAPUsed ? 0 : $this->userManager->countUsersOfGroups($groupsInfo->getGroups()); |
|
|
|
$disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsersOfGroups($groupsNames); |
|
|
|
$disabledUsers = $isLDAPUsed ? -1 : $this->userManager->countDisabledUsersOfGroups($groupsNames); |
|
|
|
} |
|
|
|
$disabledUsersGroup = [ |
|
|
|
'id' => 'disabled', |
|
|
|
|
|
|
|
@ -315,8 +315,8 @@ export default { |
|
|
|
// group name |
|
|
|
item.text = group.name; |
|
|
|
|
|
|
|
// users count |
|
|
|
if (group.usercount - group.disabled > 0) { |
|
|
|
// users count for all groups |
|
|
|
if (group.usercount - group.disabled > 0 || group.usercount === -1) { |
|
|
|
item.utils.counter = group.usercount - group.disabled; |
|
|
|
} |
|
|
|
|
|
|
|
@ -363,8 +363,11 @@ export default { |
|
|
|
if (disabledGroup && disabledGroup.text) { |
|
|
|
disabledGroup.text = t('settings', 'Disabled users'); // rename disabled group |
|
|
|
disabledGroup.icon = 'icon-disabled-users'; // set icon |
|
|
|
if (disabledGroup.utils && disabledGroup.utils.counter > 0) { |
|
|
|
groups.unshift(disabledGroup); // add disabled if not empty |
|
|
|
if (disabledGroup.utils && ( |
|
|
|
disabledGroup.utils.counter > 0 // add disabled if not empty |
|
|
|
|| disabledGroup.utils.counter === -1) // add disabled if ldap enabled |
|
|
|
) { |
|
|
|
groups.unshift(disabledGroup); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|