diff --git a/awx/ui/static/js/helpers/EventViewer.js b/awx/ui/static/js/helpers/EventViewer.js index e316bcd6b3..898c464429 100644 --- a/awx/ui/static/js/helpers/EventViewer.js +++ b/awx/ui/static/js/helpers/EventViewer.js @@ -461,7 +461,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo } function parseJSON(obj) { - var h, html = '', key, keys, found = false; + var h, html = '', key, keys, found = false, string_warnings = "", string_cmd = ""; if (typeof obj === "object") { html += "\n"; html += "\n"; @@ -486,7 +486,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo h = ''; if (key !== 'host_id' && key !== 'parent' && key !== 'event' && key !== 'src' && key !== 'md5sum' && key !== 'stdout' && key !== 'traceback' && key !== 'stderr' && key !== 'cmd' && key !=='changed' && key !== "verbose_override" && - key !== 'feature_result') { + key !== 'feature_result' && key !== 'warnings') { if (!EventsViewerForm.fields[key]) { h = parseItem(obj[key], key, key); if (h) { @@ -494,6 +494,26 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo found = true; } } + } else if (key === 'cmd') { + // only show cmd if it's a cmd that was run + if (!EventsViewerForm.fields[key] && obj[key].length > 0) { + // include the label head Shell Command instead of CMD in the modal + string_cmd += obj[key].join(" "); + h = parseItem(string_cmd, key, "Shell Command"); + if (h) { + html += h; + found = true; + } + } + } else if (key === 'warnings') { + if (!EventsViewerForm.fields[key] && obj[key].length > 0) { + string_warnings += obj[key].join(" "); + h = parseItem(string_warnings, key, "Warnings"); + if (h) { + html += h; + found = true; + } + } } } } diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index d0c0e8e45f..6c5e1221ee 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -44,142 +44,142 @@ {% if settings.USE_MINIFIED_JS %} - + {% else %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% endif %}