From 90423db9b7344df177e00bddbac5d9a3419e170a Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Thu, 3 Jul 2014 15:22:29 -0400
Subject: [PATCH] fixed auth error introduced by earlier changes to dashboard

---
 awx/ui/static/js/widgets/HostGraph.js      | 32 +++++++++++++----
 awx/ui/static/js/widgets/JobStatusGraph.js | 42 ++++++++++++++++------
 2 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/awx/ui/static/js/widgets/HostGraph.js b/awx/ui/static/js/widgets/HostGraph.js
index 8e8e0a9897..3f249d9d8b 100644
--- a/awx/ui/static/js/widgets/HostGraph.js
+++ b/awx/ui/static/js/widgets/HostGraph.js
@@ -36,7 +36,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
                             //$scope.$emit('dashboardReady', data);
                             // console.log(data);
                             license = data.license_info.available_instances;
-                            makeHostCountGraph(license);
+                            createGraph(license);
 
                         })
                         .error(function (data, status) {
@@ -47,15 +47,33 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
                         //return license;
                 }
 
+                function createGraph(license){
+                    Rest.setUrl(GetBasePath('dashboard')+'graphs/');
+                    Rest.get()
+                        .success(function (data) {
+                            //$scope.$emit('dashboardReady', data);
+                            // console.log(data);
+                            //license = data.license_info.available_instances;
 
-                function makeHostCountGraph(license){
+                            makeHostCountGraph(license, data);
+
+                        })
+                        .error(function (data, status) {
+                            //Wait('stWaitop');
+                            ProcessErrors(null, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard graph data: ' + status });
+                        });
+
+                        //return license;
+                }
+
+                function makeHostCountGraph(license, data){
                         url = GetBasePath('dashboard')+'graphs/';
                         var graphData = [];
 
                      //d3.json("static/js/jobstatusdata.json",function(error,data) {
-                        d3.json(url, function(error,data) {
+                        //d3.json(url, function(error,data) {
 
-                            graphData = [
+                        graphData = [
                                 {
                                     "key" : "Hosts" ,
                                     "color" : "#1778c3",
@@ -68,7 +86,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
                                 }
                             ];
 
-                            graphData.map(function(series) {
+                        graphData.map(function(series) {
                                 if(series.key==="Hosts"){
                                     series.values = series.values.map(function(d) {
                                         return {
@@ -90,7 +108,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
 
                             });
 
-                            nv.addGraph({
+                        nv.addGraph({
                                 generate: function() {
                                     var width = nv.utils.windowSize().width/3,
                                     height = nv.utils.windowSize().height/5,
@@ -139,7 +157,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
                                 },
 
                             });
-                        });
+                        //});
                     }
 
                 element = angular.element(document.getElementById(target));
diff --git a/awx/ui/static/js/widgets/JobStatusGraph.js b/awx/ui/static/js/widgets/JobStatusGraph.js
index 097f7be982..d70b467509 100644
--- a/awx/ui/static/js/widgets/JobStatusGraph.js
+++ b/awx/ui/static/js/widgets/JobStatusGraph.js
@@ -11,7 +11,7 @@
 
 angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
     .factory('JobStatusGraph', ['$rootScope', '$compile', '$location' , 'Rest', 'GetBasePath', 'ProcessErrors', 'Wait',
-        function ($rootScope, $compile , $location, Rest, GetBasePath) {
+        function ($rootScope, $compile , $location, Rest, GetBasePath, ProcessErrors) {
             return function (params) {
 
                 var scope = params.scope,
@@ -47,7 +47,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
                 html += "  </a>\n";
 
                 html += "<ul class=\"dropdown-menu\" role=\"menu\" aria-labelledby=\"dLabel\">\n";
-                html += "<li><a href=\"#\">Past Day</a></li>\n";
+                html += "<li><a href=\"#\">Past 24 Hours</a></li>\n";
                 html += "<li><a href=\"#\">Past Week</a></li>\n";
                 html += "<li><a href=\"#\">Past Month</a></li>\n";
                 html += "</ul>\n";
@@ -65,15 +65,36 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
 
                 html += "</div>\n";
 
+                function createGraph(){
+                        url = GetBasePath('dashboard')+'graphs/';
+                        Rest.setUrl(url);
+                        Rest.get()
+                        .success(function (data) {
+                            //$scope.$emit('dashboardReady', data);
+                            // console.log(data);
+                           // license = data.license_info.available_instances;
+                            makeJobStatusGraph(data);
+
+                        })
+                        .error(function (data, status) {
+                            //Wait('stWaitop');
+                            ProcessErrors(null, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard graph data: ' + status });
+                        });
+
+                        //return license;
+                    }
+
+
+                //function makeHostCountGraph(license){
+
+                function makeJobStatusGraph(data){
 
-                function makeJobStatusGraph(){
-                    url = GetBasePath('dashboard')+'graphs/';
                     var graphData = [];
 
                     //d3.json("static/js/jobstatusdata.json",function(error,data) {
-                    d3.json(url, function(error,data) {
+                  //  d3.json(url, function(error,data) {
                        //console.log(data);
-                        graphData = [
+                    graphData = [
                             {
                                 "color": "#1778c3",
                                 "key": "Successful",
@@ -86,7 +107,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
                             }
                         ];
 
-                        graphData.map(function(series) {
+                    graphData.map(function(series) {
                             series.values = series.values.map(function(d) {
                                 return {
                                     x: d[0],
@@ -96,7 +117,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
                             return series;
                         });
 
-                        nv.addGraph({
+                    nv.addGraph({
                             generate: function() {
                                 var width = nv.utils.windowSize().width/3,
                                     height = nv.utils.windowSize().height/5,
@@ -150,14 +171,15 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
                             },
 
                         });
-                    });
+                  //  });
                 }
 
 
                 element = angular.element(document.getElementById(target));
                 element.html(html);
                 $compile(element)(scope);
-                makeJobStatusGraph();
+                createGraph();
+                //makeJobStatusGraph();
                 scope.$emit('WidgetLoaded');
 
             };