Merge pull request #12306 from nextcloud/disabled-ldap-fix

Disabled ldap fix
nextcloud · Nov 6, 2018 · c92d35a · c92d35a
2 parents ccd89f3 + 7260d22
commit c92d35a
Show file tree

Hide file tree

Showing 12 changed files with 2,707 additions and 1,375 deletions.
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
@@ -192,7 +192,7 @@ public function usersList() {
 		}
 
 		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 @@ public function usersList() {
 				}
 			};
 			$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/js/1.js b/settings/js/1.js
diff --git a/settings/js/1.js.map b/settings/js/1.js.map
diff --git a/settings/js/2.js b/settings/js/2.js
diff --git a/settings/js/2.js.map b/settings/js/2.js.map
diff --git a/settings/js/4.js.map b/settings/js/4.js.map
diff --git a/settings/js/5.js b/settings/js/5.js
diff --git a/settings/js/5.js.map b/settings/js/5.js.map
diff --git a/settings/js/settings-admin-security.js b/settings/js/settings-admin-security.js
diff --git a/settings/js/settings-admin-security.js.map b/settings/js/settings-admin-security.js.map
diff --git a/settings/js/settings-vue.js.map b/settings/js/settings-vue.js.map
diff --git 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);						
 				}
 			}