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

Show any/all convergence option on root node

Browse Source
This commit is contained in:
Jake McDermott
2020-02-05 15:49:31 -05:00
parent fd60cd1a35
commit b06645e125
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
View File

@@ -183,7 +183,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-show="!(nodeConfig.editNodeIsRoot || nodeConfig.newNodeIsRoot)"> <div id="workflow_node_checkbox_group" class="form-group Form-formGroup Form-formGroup--singleColumn" >
<label for="edgeType" class="Form-inputLabelContainer"> <label for="edgeType" class="Form-inputLabelContainer">
<span class="Form-requiredAsterisk">*</span> <span class="Form-requiredAsterisk">*</span>
<span class="Form-inputLabel">{{:: strings.get('workflow_maker.CONVERGENCE') }}</span> <span class="Form-inputLabel">{{:: strings.get('workflow_maker.CONVERGENCE') }}</span>

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

@@ -720,15 +720,6 @@ export default ['$scope', 'TemplatesService',
/* EDIT NODE FUNCTIONS */ /* EDIT NODE FUNCTIONS */
$scope.startEditNode = (nodeToEdit) => { $scope.startEditNode = (nodeToEdit) => {
// Determine if this is a root node
let editNodeIsRoot = false;
$scope.graphState.arrayOfLinksForChart.forEach((link) => {
if (link.source.id === 1 && link.target.id === nodeIdToChartNodeIdMapping[nodeToEdit.id]) {
editNodeIsRoot = true;
return;
}
});
$scope.workflowChangesStarted = true; $scope.workflowChangesStarted = true;
if ($scope.linkConfig) { if ($scope.linkConfig) {
$scope.cancelLinkForm(); $scope.cancelLinkForm();
@@ -742,8 +733,7 @@ export default ['$scope', 'TemplatesService',
$scope.nodeConfig = { $scope.nodeConfig = {
mode: "edit", mode: "edit",
nodeId: nodeToEdit.id, nodeId: nodeToEdit.id,
node: nodeRef[nodeToEdit.id], node: nodeRef[nodeToEdit.id]
editNodeIsRoot,
}; };
$scope.graphState.nodeBeingEdited = nodeToEdit.id; $scope.graphState.nodeBeingEdited = nodeToEdit.id;