External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Eventviewer

Browse Source 
Not displaying results for 'unreachable-host-X' events under Summary section. Issue was that event_data.res returned from the API as a string rather than an object. The UI expected an object.
This commit is contained in:
Chris Houseknecht
2014-08-13 12:56:27 -04:00
parent 7721a52584
commit 41a0f786ed
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,6 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
scope.removeEventReady = scope.$on('EventReady', function(e, data) { scope.removeEventReady = scope.$on('EventReady', function(e, data) {
var btns; var btns;
scope.events = data; scope.events = data;
if (event_id) { if (event_id) {
// find and show the selected event // find and show the selected event
data.every(function(row, idx) { data.every(function(row, idx) {
@@ -295,8 +294,14 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
scope.next_event_set = data.next; scope.next_event_set = data.next;
scope.prev_event_set = data.previous; scope.prev_event_set = data.previous;
data.results.forEach(function(event) { data.results.forEach(function(event) {
var key, event_data = {}; var msg, key, event_data = {};
if (event.event_data.res) { if (event.event_data.res) {
if (typeof event.event_data.res !== 'object') {
// turn event_data.res into an object
msg = event.event_data.res;
event.event_data.res = {};
event.event_data.res.msg = msg;
}
for (key in event.event_data) { for (key in event.event_data) {
if (key !== "res") { if (key !== "res") {
event.event_data.res[key] = event.event_data[key]; event.event_data.res[key] = event.event_data[key];
@@ -475,6 +480,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
return (found) ? html : ''; return (found) ? html : '';
} }
html = parseJSON(event); html = parseJSON(event);
e = angular.element(document.getElementById(id)); e = angular.element(document.getElementById(id));
e.empty(); e.empty();
if (html) { if (html) {