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

Merge pull request #4991 from mabashian/2964-delete-nodes

Browse Source 
Fixed node deletion/conflict bug
This commit is contained in:
Michael Abashian
2017-01-27 18:17:57 -05:00
committed by GitHub
parent 0a5b037236 2dbc3abc34
commit 7dcec7521a
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() {
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) {
return TemplatesService.deleteWorkflowJobTemplateNode(nodeId);
});
$q.all(associatePromises.concat(deletePromises))
$q.all(associatePromises)
.then(function() {
$scope.closeDialog();
});