External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 23:46:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixes bug where all_parents_must_converge was not being set for new or existing approval nodes.

Browse Source
This commit is contained in:
mabashian
2020-05-18 13:23:19 -04:00
parent 49edaab861
commit f29144ba91
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,11 +148,14 @@ export default ['$scope', 'TemplatesService',
Object.keys(nodeRef).map((workflowMakerNodeId) => { Object.keys(nodeRef).map((workflowMakerNodeId) => {
const node = nodeRef[workflowMakerNodeId]; const node = nodeRef[workflowMakerNodeId];
const all_parents_must_converge = _.get(node, 'all_parents_must_converge', false);
if (node.isNew) { if (node.isNew) {
if (node.unifiedJobTemplate && node.unifiedJobTemplate.unified_job_type === "workflow_approval") { if (node.unifiedJobTemplate && node.unifiedJobTemplate.unified_job_type === "workflow_approval") {
addPromises.push(TemplatesService.addWorkflowNode({ addPromises.push(TemplatesService.addWorkflowNode({
url: $scope.workflowJobTemplateObj.related.workflow_nodes, url: $scope.workflowJobTemplateObj.related.workflow_nodes,
data: {} data: {
all_parents_must_converge
}
}).then(({data: newNodeData}) => { }).then(({data: newNodeData}) => {
Rest.setUrl(newNodeData.related.create_approval_template); Rest.setUrl(newNodeData.related.create_approval_template);
approvalTemplatePromises.push(Rest.post({ 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 { } else {
editPromises.push(TemplatesService.editWorkflowNode({ editPromises.push(TemplatesService.editWorkflowNode({
id: node.originalNodeObject.id, id: node.originalNodeObject.id,