External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-18 06:47:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Event viewer status icon

Browse Source 
The getStatus function was not accessing the event array correctly.
This commit is contained in:
Chris Houseknecht
2014-07-22 13:40:43 -04:00
parent e6b738e177
commit 8be350b791
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/controllers/JobStdout.js
View File

@@ -117,6 +117,10 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams,
start: (data.range.start < 0) ? 0 : data.range.start, start: (data.range.start < 0) ? 0 : data.range.start,
end: data.range.end 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")); $('#pre-container').scrollTop($('#pre-container').prop("scrollHeight"));
//console.log($('#pre-container-content').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, start: (data.range.start < 0) ? 0 : data.range.start,
end: data.range.end 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 (should_apply_live_events) {
// if user has not disabled live event view by scrolling upward, then scroll down to the new content // if user has not disabled live event view by scrolling upward, then scroll down to the new content
current_range = data.range; current_range = data.range;

10
awx/ui/static/js/helpers/EventViewer.js
View File

@@ -266,9 +266,9 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
Wait('start'); Wait('start');
} }
function getStatus(data) { function getStatus(e) {
return (data.results[0].event === "runner_on_unreachable") ? "unreachable" : (data.results[0].event === "runner_on_skipped") ? 'skipped' : (data.results[0].failed) ? 'failed' : return (e.event === "runner_on_unreachable") ? "unreachable" : (e.event === "runner_on_skipped") ? 'skipped' : (e.failed) ? 'failed' :
(data.results[0].changed) ? 'changed' : 'ok'; (e.changed) ? 'changed' : 'ok';
} }
Rest.setUrl(url); Rest.setUrl(url);
@@ -289,11 +289,11 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
event.event_data.res.task = "Gathering Facts"; event.event_data.res.task = "Gathering Facts";
delete event.event_data.res.ansible_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; event_data = event.event_data.res;
} }
else { else {
event.event_data.status = getStatus(data); event.event_data.status = getStatus(event);
event_data = event.event_data; event_data = event.event_data;
} }
// convert results to stdout // convert results to stdout