diff --git a/src/js/index.js b/src/js/index.js index 4df3a58df..d9febc20e 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -342,7 +342,7 @@ app.filter('eventLogSource', function() { var errorMessage = data.errorMessage; // ({{ eventLog.source.ip || eventLog.source.appId }}) - var line = source.username || source.userId || source.authType; + var line = source.username || source.userId || source.authType || 'system'; if (source.app) line += ' - ' + source.app.fqdn; else if (source.ip) line += ' - ' + source.ip; diff --git a/src/views/activity.js b/src/views/activity.js index 9a05b3bbe..6fdb92983 100644 --- a/src/views/activity.js +++ b/src/views/activity.js @@ -49,12 +49,12 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca $scope.busy = true; var actions = $scope.selectedActions.map(function (a) { return a.value; }).join(', '); - Client.getEventLogs(actions, $scope.search || null, $scope.currentPage, $scope.pageItems.value, function (error, eventLogs) { + Client.getEventLogs(actions, $scope.search || null, $scope.currentPage, $scope.pageItems.value, function (error, result) { $scope.busy = false; if (error) return console.error(error); - $scope.eventLogs = eventLogs; + $scope.eventLogs = result; }); }