External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-18 21:21:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7065 from mabashian/6998-convergence-approval

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

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-05-18 18:28:54 +00:00 committed by GitHub
commit 9a66364a9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats 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) => {
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,