summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-01-16 18:04:29 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-01-16 18:04:29 +0100
commit616fd4b54aa8c7fed6f2d8a385bcf50867645b29 (patch)
tree68f303f32dbdd0abfdc9ec07424134b2a2f9bb10 /settings
parent6d87922cea82ce56611080528e9d02ebcdd112b8 (diff)
downloadnextcloud-server-616fd4b54aa8c7fed6f2d8a385bcf50867645b29.tar.gz
nextcloud-server-616fd4b54aa8c7fed6f2d8a385bcf50867645b29.zip
Increase initial user count to 50
* fix initial user count if you have a big screen (or a portrait screen)
Diffstat (limited to 'settings')
-rw-r--r--settings/js/users/users.js6
-rw-r--r--settings/users.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 63bba72508e..db76ed00999 100644
--- 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 94dda43c523..b6654e3b0fa 100644
--- 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;
}