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

Merge pull request #20108 from owncloud/initially_load_250_users 

Initially load 250 users
This commit is contained in:
Thomas Müller 2015-10-28 13:45:05 +01:00
parent e54c22eb59 69417e3654
commit 17f83b17b9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
settings/js/users/users.js
View File

@ -14,6 +14,7 @@ var UserList = {
availableGroups: [],
offset: 0,
usersToLoad: 10, //So many users will be loaded when user scrolls down
initialUsersToLoad: 250, //initial number of users to load
currentGid: '',
filter: '',
@ -286,7 +287,7 @@ var UserList = {
if(UserList.isEmpty === false) {
UserList.usersToLoad = 10;
} else {
UserList.usersToLoad = 30;
UserList.usersToLoad = UserList.initialUsersToLoad;
}
},
empty: function() {
@ -900,16 +901,20 @@ $(document).ready(function () {
});
// calculate initial limit of users to load
var initialUserCountLimit = 20,
var initialUserCountLimit = UserList.initialUsersToLoad,
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;
if (initialUserCountLimit < UserList.initialUsersToLoad) {
initialUserCountLimit = UserList.initialUsersToLoad;
}
}
//realign initialUserCountLimit with usersToLoad as a safeguard
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
UserList.update(UserList.currentGid, initialUserCountLimit);