jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove page size selector and move pagination to the bottom

Browse Source
This commit is contained in:
Johannes Zellner
2021-12-09 21:21:21 +01:00
parent 52f1205822
commit b6159aabae
3 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/users.js
View File

@@ -39,12 +39,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.userSearchString = '';
$scope.currentPage = 1;
$scope.pageItemCount = [
{ name: $translate.instant('main.pagination.perPageSelector', { n: 20 }), value: 20 },
{ name: $translate.instant('main.pagination.perPageSelector', { n: 50 }), value: 50 },
{ name: $translate.instant('main.pagination.perPageSelector', { n: 100 }), value: 100 }
];
$scope.pageItems = $scope.pageItemCount[0];
$scope.pageItems = 15;
$scope.userRefreshBusy = true;
$scope.groupMembers = function (group) {
@@ -887,10 +882,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
function getUsers(callback) {
var users = [];
Client.getUsers($scope.userSearchString, $scope.currentPage, $scope.pageItems.value, function (error, results) {
Client.getUsers($scope.userSearchString, $scope.currentPage, $scope.pageItems, function (error, results) {
if (error) return console.error(error);
async.eachOfLimit(results, 20, function (result, index, iteratorDone) {
async.eachOf(results, function (result, index, iteratorDone) {
Client.getUser(result.id, function (error, user) {
if (error) return iteratorDone(error);
@@ -951,8 +946,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
refreshUsers();
};
$scope.updateFilter = function (fresh) {
if (fresh) $scope.currentPage = 1;
$scope.updateFilter = function () {
refreshUsers();
};