Skip to content

Commit c92d35a

Browse files
authored
Merge pull request #12306 from nextcloud/disabled-ldap-fix
Disabled ldap fix
2 parents ccd89f3 + 7260d22 commit c92d35a

File tree

12 files changed

+2707
-1375
lines changed

12 files changed

+2707
-1375
lines changed

settings/Controller/UsersController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public function usersList() {
192192
}
193193

194194
if ($this->isAdmin) {
195-
$disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsers();
195+
$disabledUsers = $isLDAPUsed ? -1 : $this->userManager->countDisabledUsers();
196196
$userCount = $isLDAPUsed ? 0 : array_reduce($this->userManager->countUsers(), function($v, $w) {
197197
return $v + (int)$w;
198198
}, 0);
@@ -214,7 +214,7 @@ public function usersList() {
214214
}
215215
};
216216
$userCount += $isLDAPUsed ? 0 : $this->userManager->countUsersOfGroups($groupsInfo->getGroups());
217-
$disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsersOfGroups($groupsNames);
217+
$disabledUsers = $isLDAPUsed ? -1 : $this->userManager->countDisabledUsersOfGroups($groupsNames);
218218
}
219219
$disabledUsersGroup = [
220220
'id' => 'disabled',

settings/js/1.js

Lines changed: 2674 additions & 1347 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/1.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/2.js

Lines changed: 11 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/2.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/4.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/5.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/5.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/settings-admin-security.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/settings-admin-security.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)