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

Make sure to delete any nodes that need to be deleted before attempting to associate

Browse Source
This commit is contained in:
Michael Abashian
2017-01-27 11:23:20 -05:00
parent ae057d2bd5
commit 2dbc3abc34
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
View File

@@ -296,7 +296,11 @@ export default ['$scope', 'WorkflowService', 'generateList', 'TemplateList', 'Pr
}); });
}); });
$q.all(disassociatePromises.concat(editNodePromises)) let deletePromises = $scope.treeData.data.deletedNodes.map(function(nodeId) {
return TemplatesService.deleteWorkflowJobTemplateNode(nodeId);
});
$q.all(disassociatePromises.concat(editNodePromises, deletePromises))
.then(function() { .then(function() {
let associatePromises = $scope.associateRequests.map(function(request) { let associatePromises = $scope.associateRequests.map(function(request) {
@@ -307,11 +311,7 @@ export default ['$scope', 'WorkflowService', 'generateList', 'TemplateList', 'Pr
}); });
}); });
let deletePromises = $scope.treeData.data.deletedNodes.map(function(nodeId) { $q.all(associatePromises)
return TemplatesService.deleteWorkflowJobTemplateNode(nodeId);
});
$q.all(associatePromises.concat(deletePromises))
.then(function() { .then(function() {
$scope.closeDialog(); $scope.closeDialog();
}); });