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

Have a better fallback for eventlog source

Browse Source
This commit is contained in:
Johannes Zellner
2018-06-07 23:04:26 +02:00
parent 801dbc9705
commit a58d9d1497
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/index.js
+1 -1
View File
@@ -342,7 +342,7 @@ app.filter('eventLogSource', function() {
var errorMessage = data.errorMessage;
// <span ng-show="eventLog.source.ip || eventLog.source.appId"> ({{ eventLog.source.ip || eventLog.source.appId }}) </span>
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;
src/views/activity.js
+2 -2
View File
@@ -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;
});
}