External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 06:29:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Dashboard

Browse Source 
Clean up call to ProcessErrors. It should always include scope.
This commit is contained in:
Chris Houseknecht
2014-07-07 18:24:10 -04:00
parent 73edea6786
commit ba817d6a1d
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/controllers/Home.js
View File

@@ -122,7 +122,8 @@ function Home($scope, $compile, $routeParams, $rootScope, $location, Wait, Dashb
} }
Home.$inject = ['$scope', '$compile', '$routeParams', '$rootScope', '$location', 'Wait', 'DashboardCounts', 'HostGraph','JobStatusGraph', 'DashboardJobs', 'ClearScope', 'Stream', 'Rest', 'GetBasePath', 'ProcessErrors', 'Button' Home.$inject = ['$scope', '$compile', '$routeParams', '$rootScope', '$location', 'Wait', 'DashboardCounts', 'HostGraph','JobStatusGraph', 'DashboardJobs',
'ClearScope', 'Stream', 'Rest', 'GetBasePath', 'ProcessErrors', 'Button'
]; ];

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

@@ -42,9 +42,9 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
}) })
.error(function (data, status) { .error(function (data, status) {
//Wait('stWaitop'); //Wait('stWaitop');
ProcessErrors(null, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard graph data: ' + status }); ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard graph data: ' + status });
}); });
if (scope.removeLicenseCountReady) { if (scope.removeLicenseCountReady) {
@@ -55,11 +55,10 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
Rest.get() Rest.get()
.success(function (data) { .success(function (data) {
scope.$emit('hostDataReady', data, license); scope.$emit('hostDataReady', data, license);
}) })
.error(function (data, status) { .error(function (data, status) {
//Wait('stWaitop'); //Wait('stWaitop');
ProcessErrors(null, data, status, null, { hdr: 'Error!', msg: 'Failed to get license info ' + status }); ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get license info ' + status });
}); });
}); });

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

@@ -72,15 +72,15 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
url = GetBasePath('dashboard')+'graphs/?period='+period+'&type='+job_type; url = GetBasePath('dashboard')+'graphs/?period='+period+'&type='+job_type;
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success(function (data){ .success(function (data){
scope.$emit('graphDataReady', data); scope.$emit('graphDataReady', data);
return job_type, period; return job_type, period;
}) })
.error(function (data, status) { .error(function (data, status) {
//Wait('stWaitop'); //Wait('stWaitop');
ProcessErrors(null, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard graph data: ' + status }); ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Failed to get dashboard graph data: ' + status });
}); });
} }
element = angular.element(document.getElementById(target)); element = angular.element(document.getElementById(target));