External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 08:18:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixed a few straggling success/error promises and replaced with then/catch

Browse Source
This commit is contained in:
mabashian
2018-01-11 13:59:46 -05:00
parent 03cef6fea3
commit f9b0a3121f
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
View File

@@ -138,16 +138,16 @@ export default
this.url = GetBasePath('inventory_sources') + id + '/hosts/'; this.url = GetBasePath('inventory_sources') + id + '/hosts/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.destroy() return Rest.destroy()
.success(this.success.bind(this)) .then(this.success.bind(this))
.error(this.error.bind(this)) .catch(this.error.bind(this))
.finally(); .finally();
}, },
deleteGroups(id) { deleteGroups(id) {
this.url = GetBasePath('inventory_sources') + id + '/groups/'; this.url = GetBasePath('inventory_sources') + id + '/groups/';
Rest.setUrl(this.url); Rest.setUrl(this.url);
return Rest.destroy() return Rest.destroy()
.success(this.success.bind(this)) .then(this.success.bind(this))
.error(this.error.bind(this)) .catch(this.error.bind(this))
.finally(); .finally();
} }
}; };

2
awx/ui/client/src/organizations/list/organizations-list.controller.js
View File

@@ -92,7 +92,7 @@ export default ['$stateParams', '$scope', '$rootScope',
$scope.$on("ReloadOrgListView", function() { $scope.$on("ReloadOrgListView", function() {
Rest.setUrl($scope.current_url); Rest.setUrl($scope.current_url);
Rest.get() Rest.get()
.success((data) => $scope.organizations = data.results) .then(({data}) => $scope.organizations = data.results)
.catch(({data, status}) => { .catch(({data, status}) => {
ProcessErrors($scope, data, status, null, { ProcessErrors($scope, data, status, null, {
hdr: 'Error!', hdr: 'Error!',

6
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
View File

@@ -919,9 +919,9 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
Rest.setUrl(GetBasePath("unified_jobs") + "?id=" + d.job.id); Rest.setUrl(GetBasePath("unified_jobs") + "?id=" + d.job.id);
Rest.get() Rest.get()
.success(function (res) { .then(function (res) {
if(res.results && res.results.length > 0) { if(res.data.results && res.data.results.length > 0) {
goToJobResults(res.results[0].type); goToJobResults(res.data.results[0].type);
} }
}) })
.catch(({data, status}) => { .catch(({data, status}) => {

10
awx/ui/client/src/workflow-results/workflow-results.route.js
View File

@@ -58,13 +58,13 @@ export default {
// Get the workflow nodes // Get the workflow nodes
Rest.setUrl(nextUrl); Rest.setUrl(nextUrl);
Rest.get() Rest.get()
.success(function(nextData) { .then(function(nextData) {
for(var i=0; i<nextData.results.length; i++) { for(var i=0; i<nextData.data.results.length; i++) {
allNodes.push(nextData.results[i]); allNodes.push(nextData.data.results[i]);
} }
if(nextData.next) { if(nextData.data.next) {
// Get the next page // Get the next page
getNodes(nextData.next); getNodes(nextData.data.next);
} }
else { else {
defer.resolve(allNodes); defer.resolve(allNodes);