summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-02-04 17:19:11 +0100
committerArthur Schiwon <blizzz@owncloud.com>2015-02-04 17:19:11 +0100
commit30b24696c869891c2eb82d7661bd6207bd956062 (patch)
treed35767c9e1de207aea9b5d9c47e9dc697a9c4053
parent77e9c212edb1b0b1bbd2dfc8231ce5f183d6c3c8 (diff)
downloadnextcloud-server-30b24696c869891c2eb82d7661bd6207bd956062.tar.gz
nextcloud-server-30b24696c869891c2eb82d7661bd6207bd956062.zip
fix user loading
-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