From 69caf45dec1395b64fcfa1ece5a35f7b732ba58a Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Wed, 25 Jan 2017 16:13:45 -0800 Subject: [PATCH] Adding additional check for when event_type isn't a runner_on or playbook_on event --- .../src/job-results/job-results.controller.js | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index b4b79a7533..38a865322e 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -275,7 +275,9 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy $scope.events[mungedEvent.counter] .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 // out pane where they should go (within the // right header section, before the next line @@ -294,7 +296,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy putIn = classList .filter(v => v.indexOf("play_") > -1)[0]; } - + var putAfter; var isDup = false; $(".header_" + putIn + ",." + putIn) @@ -324,8 +326,18 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy classList = null; putIn = null; } else { - // this is a header or recap line, so just - // append to the bottom + // if we get here then the event type was either a + // 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 .element(".JobResultsStdOut-stdoutContainer") .append($compile(mungedEvent