From 2dbc3abc34186176167648f988a8b59289b6efa6 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Fri, 27 Jan 2017 11:23:20 -0500 Subject: [PATCH] Make sure to delete any nodes that need to be deleted before attempting to associate --- .../workflow-maker/workflow-maker.controller.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js index 63c36bca39..77caaa6032 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js @@ -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(); });