From 011545035d35bc66135b24167650bc37686a5eda Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansibleworks.com>
Date: Tue, 3 Sep 2013 08:38:10 -0400
Subject: [PATCH] Lates UI changes

---
 awx/ui/static/js/helpers/Hosts.js     | 24 ++--------
 awx/ui/static/js/helpers/inventory.js | 66 ++++++++++++++-------------
 2 files changed, 37 insertions(+), 53 deletions(-)

diff --git a/awx/ui/static/js/helpers/Hosts.js b/awx/ui/static/js/helpers/Hosts.js
index 8349b4a88b..0792e85be6 100644
--- a/awx/ui/static/js/helpers/Hosts.js
+++ b/awx/ui/static/js/helpers/Hosts.js
@@ -460,34 +460,16 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
         }])
 
 
-    .factory('LoadSearchTree', ['Rest', 'GetBasePath', 'ProcessErrors', '$compile', '$rootScope', 'Wait',
-    function(Rest, GetBasePath, ProcessErrors, $compile, $rootScope, Wait) {
+    .factory('LoadSearchTree', ['Rest', 'GetBasePath', 'ProcessErrors', '$compile', '$rootScope', 'Wait', 'SortNodes',
+    function(Rest, GetBasePath, ProcessErrors, $compile, $rootScope, Wait, SortNodes) {
     return function(params) {
 
         var scope = params.scope; 
         var inventory_id = params.inventory_id;
         var html = '';
 
-        function sortNodes(data) {
-            //Sort nodes by name
-            var names = [];
-            var newData = [];
-            for (var i=0; i < data.length; i++) {
-                names.push(data[i].name);
-            }
-            names.sort();
-            for (var j=0; j < names.length; j++) {
-                for (i=0; i < data.length; i++) {
-                    if (data[i].name == names[j]) {
-                       newData.push(data[i]);
-                    }
-                }
-            }
-            return newData;
-            }
-
         function buildHTML(tree_data) {
-            var sorted = sortNodes(tree_data);
+            var sorted = SortNodes(tree_data);
             html += (sorted.length > 0) ? "<ul>\n" : "";
             for(var i=0; i < sorted.length; i++) {
                html += "<li id=\"search-node-1000\" data-state=\"opened\" data-hosts=\"" + sorted[i].related.hosts + "\" " +
diff --git a/awx/ui/static/js/helpers/inventory.js b/awx/ui/static/js/helpers/inventory.js
index 587936f13b..566b7f6677 100644
--- a/awx/ui/static/js/helpers/inventory.js
+++ b/awx/ui/static/js/helpers/inventory.js
@@ -14,8 +14,8 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
                                     'InventoryFormDefinition', 'ParseHelper'
                                     ]) 
 
-    .factory('LoadTreeData', ['Alert', 'Rest', 'Authorization', '$http', 'Wait',
-    function(Alert, Rest, Authorization, $http, Wait) {
+    .factory('LoadTreeData', ['Alert', 'Rest', 'Authorization', '$http', 'Wait', 'SortNodes',
+    function(Alert, Rest, Authorization, $http, Wait, SortNodes) {
     return function(params) {
 
         var scope = params.scope;
@@ -48,26 +48,8 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
                 children:[] 
                 }];
 
-        function sortNodes(data) {
-            //Sort nodes by name
-            var names = [];
-            var newData = [];
-            for (var i=0; i < data.length; i++) {
-                names.push(data[i].name);
-            }
-            names.sort();
-            for (var j=0; j < names.length; j++) {
-                for (i=0; i < data.length; i++) {
-                    if (data[i].name == names[j]) {
-                       newData.push(data[i]);
-                    }
-                }
-            }
-            return newData;
-            }
-
         function addNodes(tree, data) {
-            var sorted = sortNodes(data);
+            var sorted = SortNodes(data);
             for (var i=0; i < sorted.length; i++) {
                 tree.children.push({
                     data: {
@@ -96,17 +78,17 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
             }
             }
 
-          Rest.setUrl(scope.treeData); 
-          Rest.get()
-              .success( function(data, status, headers, config) {
-                  var sorted = sortNodes(data);
-                  addNodes(treeData[0], sorted);
-                  scope.$emit('buildTree', treeData, idx, group_idx);  
-              })
-              .error( function(data, status, headers, config) {
-                  ProcessErrors(scope, data, status, form,
-                      { hdr: 'Error!', msg: 'Failed to retrieve inventory tree data. GET returned status: ' + status });
-              });
+        Rest.setUrl(scope.treeData); 
+        Rest.get()
+            .success( function(data, status, headers, config) {
+                var sorted = SortNodes(data);
+                addNodes(treeData[0], sorted);
+                scope.$emit('buildTree', treeData, idx, group_idx);  
+            })
+            .error( function(data, status, headers, config) {
+                ProcessErrors(scope, data, status, form,
+                    { hdr: 'Error!', msg: 'Failed to retrieve inventory tree data. GET returned status: ' + status });
+            });
 
         }
         }])
@@ -666,5 +648,25 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
                     { hdr: 'Error!', msg: 'Failed to retrieve inventory groups. GET returned status: ' + status });
                 });
     }
+    }])
+
+    .factory('SortNodes', [ function() {
+    return function(data) {
+        //Sort nodes by name
+        var names = [];
+        var newData = [];
+        for (var i=0; i < data.length; i++) {
+            names.push(data[i].name);
+        }
+        names.sort();
+        for (var j=0; j < names.length; j++) {
+            for (i=0; i < data.length; i++) {
+                if (data[i].name == names[j]) {
+                   newData.push(data[i]);
+                }
+            }
+        }
+        return newData;
+    }
     }]);