mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13897 from owncloud/fix-13644 

fix user loading
This commit is contained in:
blizzz 2015-02-04 18:36:40 +01:00
parent 7b0d9f5035 30b24696c8
commit 4a1c0b1d21
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
settings/js/users/users.js
View File

@ -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