summaryrefslogtreecommitdiffstats
path: root/settings/js/users/users.js
diff options
context:
space:
mode:
Diffstat (limited to 'settings/js/users/users.js')
-rw-r--r--settings/js/users/users.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 1a755ab7b25..7034972dd15 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -422,7 +422,7 @@ var UserList = {
UserList.noMoreEntries = true;
$userList.siblings('.loading').remove();
}
- UserList.offset += loadedUsers;
+ UserList.offset += limit;
}).always(function() {
UserList.updating = false;
});
@@ -866,6 +866,11 @@ $(document).ready(function () {
containerHeight = $('#app-content').height();
if(containerHeight > 40) {
initialUserCountLimit = Math.floor(containerHeight/40);
+ while((initialUserCountLimit % UserList.usersToLoad) !== 0) {
+ // must be a multiple of this, otherwise LDAP freaks out.
+ // FIXME: solve this in LDAP backend in 8.1
+ initialUserCountLimit = initialUserCountLimit + 1;
+ }
}
// trigger loading of users on startup