External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 19:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Dashboard

Browse Source 
Restored called to /config. Turned out not to be the issue. Cleaned up a few minor things.
This commit is contained in:
Chris Houseknecht
2014-07-07 18:52:44 -04:00
parent b0f4d0452d
commit 125be34b43
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/static/js/widgets/HostGraph.js
View File

@@ -16,9 +16,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
var scope = params.scope, var scope = params.scope,
target = params.target, target = params.target,
//dashboard = params.dashboard, html, element, url, license;
html, element, url, license, url;
html = "<div class=\"graph-container\">\n"; html = "<div class=\"graph-container\">\n";
@@ -34,7 +32,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
element.html(html); element.html(html);
$compile(element)(scope); $compile(element)(scope);
/*url = GetBasePath('config'); url = GetBasePath('config');
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
@@ -45,9 +43,7 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
.error(function (data, status) { .error(function (data, status) {
ProcessErrors(scope, data, status, null, { hdr: 'Error!', ProcessErrors(scope, data, status, null, { hdr: 'Error!',
msg: 'Failed to get: ' + url + ' GET returned: ' + status }); msg: 'Failed to get: ' + url + ' GET returned: ' + status });
});*/ });
scope.$emit('licenseCountReady', 10);
if (scope.removeLicenseCountReady) { if (scope.removeLicenseCountReady) {
scope.removeLicenseCountReady(); scope.removeLicenseCountReady();

7
awx/ui/static/js/widgets/JobStatusGraph.js
View File

@@ -78,8 +78,8 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
}) })
.error(function (data, status) { .error(function (data, status) {
//Wait('stWaitop'); ProcessErrors(scope, data, status, null, { hdr: 'Error!',
ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard graph data: ' + status }); msg: 'Failed to get: ' + url + ' GET returned: ' + status });
}); });
} }
@@ -90,9 +90,6 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
createGraph(); createGraph();
if (scope.removeGraphDataReady) { if (scope.removeGraphDataReady) {
scope.removeGraphDataReady(); scope.removeGraphDataReady();
} }