From f29144ba91a662be822bcbcf11fa0ec6d23cc02b Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 18 May 2020 13:23:19 -0400 Subject: [PATCH] Fixes bug where all_parents_must_converge was not being set for new or existing approval nodes. --- .../workflow-maker/workflow-maker.controller.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 96cc1ad7e4..d701d220d6 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 @@ -148,11 +148,14 @@ export default ['$scope', 'TemplatesService', Object.keys(nodeRef).map((workflowMakerNodeId) => { const node = nodeRef[workflowMakerNodeId]; + const all_parents_must_converge = _.get(node, 'all_parents_must_converge', false); if (node.isNew) { if (node.unifiedJobTemplate && node.unifiedJobTemplate.unified_job_type === "workflow_approval") { addPromises.push(TemplatesService.addWorkflowNode({ url: $scope.workflowJobTemplateObj.related.workflow_nodes, - data: {} + data: { + all_parents_must_converge + } }).then(({data: newNodeData}) => { Rest.setUrl(newNodeData.related.create_approval_template); approvalTemplatePromises.push(Rest.post({ @@ -234,6 +237,14 @@ export default ['$scope', 'TemplatesService', }); })); } + if (node.originalNodeObject.all_parents_must_converge !== all_parents_must_converge) { + editPromises.push(TemplatesService.editWorkflowNode({ + id: node.originalNodeObject.id, + data: { + all_parents_must_converge + } + })); + } } else { editPromises.push(TemplatesService.editWorkflowNode({ id: node.originalNodeObject.id,