External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-02 01:08:48 -03:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactoration

Browse Source 
Changed event viewer fields to match the order of field defined in event viewer form.
This commit is contained in:
Chris Houseknecht
2014-07-14 18:06:57 -04:00
parent 238c7093ed
commit 5b285aced9
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/forms/EventsViewer.js
View File

@@ -45,6 +45,10 @@ angular.module('EventsViewerFormDefinition', [])
label: 'Arguments', label: 'Arguments',
section: 'Event' section: 'Event'
}, },
item: {
label: 'Item',
section: 'Event'
},
rc: { rc: {
label: 'Return Code', label: 'Return Code',
section: 'Results' section: 'Results'

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

@@ -196,14 +196,19 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
html = '', e; html = '', e;
function parseJSON(obj) { function parseJSON(obj) {
var html = '', keys, found = false; var html = '', key, keys, found = false;
if (typeof obj === "object") { if (typeof obj === "object") {
html += "<table class=\"table eventviewer-status\">\n"; html += "<table class=\"table eventviewer-status\">\n";
html += "<tbody>\n"; html += "<tbody>\n";
keys = Object.keys(obj).sort(); keys = [];
for (key in EventsViewerForm.fields) {
if (EventsViewerForm.fields[key].section === section) {
keys.push(key);
}
}
keys.forEach(function(key) { keys.forEach(function(key) {
var label; var label;
if (EventsViewerForm.fields[key] && EventsViewerForm.fields[key].section === section) { //if (EventsViewerForm.fields[key] && EventsViewerForm.fields[key].section === section) {
label = EventsViewerForm.fields[key].label; label = EventsViewerForm.fields[key].label;
if (Empty(obj[key])) { if (Empty(obj[key])) {
// exclude empty items // exclude empty items
@@ -249,7 +254,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
found = true; found = true;
html += "<tr><td class=\"key\">" + label + ":</td><td class=\"nested-table\">\n" + parseJSON(obj[key]) + "</td></tr>\n"; html += "<tr><td class=\"key\">" + label + ":</td><td class=\"nested-table\">\n" + parseJSON(obj[key]) + "</td></tr>\n";
} }
} //}
}); });
html += "</tbody>\n"; html += "</tbody>\n";
html += "</table>\n"; html += "</table>\n";