Increase initial user count to 50

* fix initial user count if you have a big screen (or a portrait screen)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 63bba72508e380bb724f44ca783b3551f8850066..db76ed00999108663d46592ff4a6dc5ddb24bcdc 100644 (file)
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -12,7 +12,7 @@ var filter;
 
 var UserList = {
        availableGroups: [],
-       offset: 30, //The first 30 users are there. No prob, if less in total.
+       offset: 50, //The first 30 users are there. No prob, if less in total.
                                //hardcoded in settings/users.php
 
        usersToLoad: 10, //So many users will be loaded when user scrolls down
@@ -215,11 +215,11 @@ var UserList = {
                }
        },
        checkUsersToLoad: function() {
-               //30 shall be loaded initially, from then on always 10 upon scrolling
+               //50 shall be loaded initially, from then on always 10 upon scrolling
                if(UserList.isEmpty === false) {
                        UserList.usersToLoad = 10;
                } else {
-                       UserList.usersToLoad = 30;
+                       UserList.usersToLoad = 50;
                }
        },
        empty: function() {

diff --git a/settings/users.php b/settings/users.php
index 94dda43c52360aa105178b00bfbdb869355157e9..b6654e3b0fac6c35b207e9ebf4504d323fb26ae3 100644 (file)
--- a/settings/users.php
+++ b/settings/users.php
@@ -32,7 +32,7 @@ $recoveryAdminEnabled = OC_App::isEnabled('files_encryption') &&
                                            OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
 
 if($isAdmin) {
-       $accessibleUsers = OC_User::getDisplayNames('', 30);
+       $accessibleUsers = OC_User::getDisplayNames('', 50);
        $subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
        /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
@@ -42,7 +42,7 @@ if($isAdmin) {
                        $gids[] = $group['id'];
                }
        }
-       $accessibleUsers = OC_Group::displayNamesInGroups($gids, '', 30);
+       $accessibleUsers = OC_Group::displayNamesInGroups($gids, '', 50);
        $subadmins = false;
 }