diff options
| author | blizzz <blizzz@owncloud.com> | 2015-02-04 18:36:40 +0100 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2015-02-04 18:36:40 +0100 |
| commit | 4a1c0b1d212926c62f13407fa787d5ad3adaa33f (patch) | |
| tree | f5aa9d82016acde5d8b0ddc186e9a6efb4eb1b4c | |
| parent | 7b0d9f50354bc64132a3963a5fe525e1d2794c54 (diff) | |
| parent | 30b24696c869891c2eb82d7661bd6207bd956062 (diff) | |
| download | nextcloud-server-4a1c0b1d212926c62f13407fa787d5ad3adaa33f.tar.gz nextcloud-server-4a1c0b1d212926c62f13407fa787d5ad3adaa33f.zip | |
Merge pull request #13897 from owncloud/fix-13644
fix user loading
| -rw-r--r-- | settings/js/users/users.js | 7 |
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 |