From 125be34b4317a712ff37e6021ade7f9d554c386b Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Mon, 7 Jul 2014 18:52:44 -0400 Subject: [PATCH] Dashboard Restored called to /config. Turned out not to be the issue. Cleaned up a few minor things. --- awx/ui/static/js/widgets/HostGraph.js | 10 +++------- awx/ui/static/js/widgets/JobStatusGraph.js | 7 ++----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/awx/ui/static/js/widgets/HostGraph.js b/awx/ui/static/js/widgets/HostGraph.js index cae63d12bf..116549b90b 100644 --- a/awx/ui/static/js/widgets/HostGraph.js +++ b/awx/ui/static/js/widgets/HostGraph.js @@ -16,9 +16,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities']) var scope = params.scope, target = params.target, - //dashboard = params.dashboard, - - html, element, url, license, url; + html, element, url, license; html = "
\n"; @@ -34,7 +32,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities']) element.html(html); $compile(element)(scope); - /*url = GetBasePath('config'); + url = GetBasePath('config'); Rest.setUrl(url); Rest.get() @@ -45,9 +43,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities']) .error(function (data, status) { ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get: ' + url + ' GET returned: ' + status }); - });*/ - - scope.$emit('licenseCountReady', 10); + }); if (scope.removeLicenseCountReady) { scope.removeLicenseCountReady(); diff --git a/awx/ui/static/js/widgets/JobStatusGraph.js b/awx/ui/static/js/widgets/JobStatusGraph.js index 0ffc835057..c73184663b 100644 --- a/awx/ui/static/js/widgets/JobStatusGraph.js +++ b/awx/ui/static/js/widgets/JobStatusGraph.js @@ -78,8 +78,8 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities']) }) .error(function (data, status) { - //Wait('stWaitop'); - ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard graph data: ' + status }); + ProcessErrors(scope, data, status, null, { hdr: 'Error!', + msg: 'Failed to get: ' + url + ' GET returned: ' + status }); }); } @@ -90,9 +90,6 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities']) createGraph(); - - - if (scope.removeGraphDataReady) { scope.removeGraphDataReady(); }