From 5b285aced9fdd772a975fbe4670d7e4ca6834cb3 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Mon, 14 Jul 2014 18:06:57 -0400
Subject: [PATCH] Job detail page refactoration Changed event viewer fields to
 match the order of field defined in event viewer form.

---
 awx/ui/static/js/forms/EventsViewer.js  |  4 ++++
 awx/ui/static/js/helpers/EventViewer.js | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/awx/ui/static/js/forms/EventsViewer.js b/awx/ui/static/js/forms/EventsViewer.js
index 6a99ef3f99..10292f6c4c 100644
--- a/awx/ui/static/js/forms/EventsViewer.js
+++ b/awx/ui/static/js/forms/EventsViewer.js
@@ -45,6 +45,10 @@ angular.module('EventsViewerFormDefinition', [])
                 label: 'Arguments',
                 section: 'Event'
             },
+            item: {
+                label: 'Item',
+                section: 'Event'
+            },
             rc: {
                 label: 'Return Code',
                 section: 'Results'
diff --git a/awx/ui/static/js/helpers/EventViewer.js b/awx/ui/static/js/helpers/EventViewer.js
index 2e336fda59..41f3a14007 100644
--- a/awx/ui/static/js/helpers/EventViewer.js
+++ b/awx/ui/static/js/helpers/EventViewer.js
@@ -196,14 +196,19 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
                 html = '', e;
 
             function parseJSON(obj) {
-                var html = '', keys, found = false;
+                var html = '', key, keys, found = false;
                 if (typeof obj === "object") {
                     html += "<table class=\"table eventviewer-status\">\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) {
                         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;
                             if (Empty(obj[key])) {
                                 // exclude empty items
@@ -249,7 +254,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
                                 found = true;
                                 html += "<tr><td class=\"key\">" + label + ":</td><td class=\"nested-table\">\n" + parseJSON(obj[key]) + "</td></tr>\n";
                             }
-                        }
+                        //}
                     });
                     html += "</tbody>\n";
                     html += "</table>\n";