Show disabled even if empty if ldap enabled

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 8460144aeb446ff1d132c25532d3cbe2c1a1c781..12c3e47dfea47712dd24952425dc4cc24a3e3611 100644 (file)
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -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',

diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue
index c4c2951ac95f18abd3971ee6750315e9eabc9a1c..15d3205956df4733e667682e0076cb7e64059f2d 100644 (file)
--- a/settings/src/views/Users.vue
+++ b/settings/src/views/Users.vue
@@ -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);                                          
                                }
                        }