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

Allow to set event item count listing

Browse Source 
Part of #113
This commit is contained in:
Johannes
2016-11-28 15:48:28 +01:00
parent df4dd4f93a
commit 48d97947c1
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webadmin/src/views/activity.html
View File

@@ -14,6 +14,8 @@
<select class="form-control" ng-model="action" ng-options="a.name for a in actions" ng-change="updateFilter()">
<option value="">-- all actions --</option>
</select>
<select class="form-control" ng-model="pageItems" ng-options="a.name for a in pageItemCount" ng-change="updateFilter(true)">
</select>
</div>
<div class="pagination pull-right">
<button class="btn btn-default btn-outline" ng-click="showPrevPage()" ng-disabled="busy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> prev</button>

14
webadmin/src/views/activity.js
View File

@@ -26,15 +26,22 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
{ name: 'user.update', value: 'user.update' }
];
$scope.pageItemCount = [
{ name: 'Show 2 per page', value: 2 },
{ name: 'Show 20 per page', value: 20 },
{ name: 'Show 50 per page', value: 50 },
{ name: 'Show 100 per page', value: 100 }
];
$scope.currentPage = 1;
$scope.pageItems = 20;
$scope.pageItems = $scope.pageItemCount[0];
$scope.action = '';
$scope.search = '';
function fetchEventLogs() {
$scope.busy = true;
Client.getEventLogs($scope.action ? $scope.action.value : null, $scope.search || null, $scope.currentPage, $scope.pageItems, function (error, eventLogs) {
Client.getEventLogs($scope.action ? $scope.action.value : null, $scope.search || null, $scope.currentPage, $scope.pageItems.value, function (error, eventLogs) {
$scope.busy = false;
if (error) return console.error(error);
@@ -55,7 +62,8 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
fetchEventLogs();
};
$scope.updateFilter = function () {
$scope.updateFilter = function (fresh) {
if (fresh) $scope.currentPage = 1;
fetchEventLogs();
};