External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 23:16:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Adding additional check for when event_type isn't a runner_on or playbook_on event

Browse Source
This commit is contained in:
jaredevantabor
2017-01-25 16:13:45 -08:00
parent dfd7b5ca62
commit 69caf45dec
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/client/src/job-results/job-results.controller.js
View File

@@ -275,7 +275,9 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
$scope.events[mungedEvent.counter] $scope.events[mungedEvent.counter]
.event = mungedEvent; .event = mungedEvent;
if (mungedEvent.stdout.indexOf("not_skeleton") > -1) { if (mungedEvent.stdout.indexOf("not_skeleton") > -1 &&
mungedEvent.name.indexOf("plabyook_") > -1 ||
mungedEvent.name.indexOf("runner_") > -1 ) {
// put non-duplicate lines into the standard // put non-duplicate lines into the standard
// out pane where they should go (within the // out pane where they should go (within the
// right header section, before the next line // right header section, before the next line
@@ -294,7 +296,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
putIn = classList putIn = classList
.filter(v => v.indexOf("play_") > -1)[0]; .filter(v => v.indexOf("play_") > -1)[0];
} }
var putAfter; var putAfter;
var isDup = false; var isDup = false;
$(".header_" + putIn + ",." + putIn) $(".header_" + putIn + ",." + putIn)
@@ -324,8 +326,18 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
classList = null; classList = null;
putIn = null; putIn = null;
} else { } else {
// this is a header or recap line, so just // if we get here then the event type was either a
// append to the bottom // header line, recap line, or one of the additional
// event types, so we append it to the bottom.
// These are the event types for captured
// stdout not directly related to playbook or runner
// events:
// (0, 'debug', _('Debug'), False),
// (0, 'verbose', _('Verbose'), False),
// (0, 'deprecated', _('Deprecated'), False),
// (0, 'warning', _('Warning'), False),
// (0, 'system_warning', _('System Warning'), False),
// (0, 'error', _('Error'), True),
angular angular
.element(".JobResultsStdOut-stdoutContainer") .element(".JobResultsStdOut-stdoutContainer")
.append($compile(mungedEvent .append($compile(mungedEvent