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

Allow to select multiple actions in the eventlog filter

Browse Source
This commit is contained in:
Johannes Zellner
2018-03-05 11:15:25 +01:00
parent 91265613a9
commit d2d8eb9485
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,12 +40,14 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
$scope.currentPage = 1;
$scope.pageItems = $scope.pageItemCount[0];
$scope.action = '';
$scope.selectedActions = [];
$scope.search = '';
function fetchEventLogs() {
$scope.busy = true;
var actions = $scope.selectedActions.map(function (a) { return a.value; }).join(', ');
Client.getEventLogs($scope.action ? $scope.action.value : null, $scope.search || null, $scope.currentPage, $scope.pageItems.value, function (error, eventLogs) {
Client.getEventLogs(actions, $scope.search || null, $scope.currentPage, $scope.pageItems.value, function (error, eventLogs) {
$scope.busy = false;
if (error) return console.error(error);