diff --git a/awx/ui/static/js/controllers/JobStdout.js b/awx/ui/static/js/controllers/JobStdout.js index e0b67bedc2..088e3c619f 100644 --- a/awx/ui/static/js/controllers/JobStdout.js +++ b/awx/ui/static/js/controllers/JobStdout.js @@ -117,6 +117,10 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams, start: (data.range.start < 0) ? 0 : data.range.start, end: data.range.end }); + + //console.log('loaded start: ' + data.range.start + ' end: ' + data.range.end); + //console.log(data.content); + $('#pre-container').scrollTop($('#pre-container').prop("scrollHeight")); //console.log($('#pre-container-content').prop("scrollHeight")); } @@ -244,6 +248,8 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams, start: (data.range.start < 0) ? 0 : data.range.start, end: data.range.end }); + //console.log('loaded start: ' + data.range.start + ' end: ' + data.range.end); + //console.log(data.content); if (should_apply_live_events) { // if user has not disabled live event view by scrolling upward, then scroll down to the new content current_range = data.range; diff --git a/awx/ui/static/js/helpers/EventViewer.js b/awx/ui/static/js/helpers/EventViewer.js index e2902f16cc..0df07f7cb5 100644 --- a/awx/ui/static/js/helpers/EventViewer.js +++ b/awx/ui/static/js/helpers/EventViewer.js @@ -266,9 +266,9 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo Wait('start'); } - function getStatus(data) { - return (data.results[0].event === "runner_on_unreachable") ? "unreachable" : (data.results[0].event === "runner_on_skipped") ? 'skipped' : (data.results[0].failed) ? 'failed' : - (data.results[0].changed) ? 'changed' : 'ok'; + function getStatus(e) { + return (e.event === "runner_on_unreachable") ? "unreachable" : (e.event === "runner_on_skipped") ? 'skipped' : (e.failed) ? 'failed' : + (e.changed) ? 'changed' : 'ok'; } Rest.setUrl(url); @@ -289,11 +289,11 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo event.event_data.res.task = "Gathering Facts"; delete event.event_data.res.ansible_facts; } - event.event_data.res.status = getStatus(data); + event.event_data.res.status = getStatus(event); event_data = event.event_data.res; } else { - event.event_data.status = getStatus(data); + event.event_data.status = getStatus(event); event_data = event.event_data; } // convert results to stdout