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

Merge pull request #5218 from mabashian/4939-between-nodes

Browse Source 
Disable workflow editor save when currently adding a node
This commit is contained in:
Michael Abashian
2017-02-08 11:35:29 -05:00
committed by GitHub
parent 819d8d1fb3 a13643ea79
commit 9e61c61285
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -762,6 +762,12 @@ export default ['$scope', 'WorkflowService', 'generateList', 'TemplateList', 'Pr
nodeToBeDeleted: $scope.nodeToBeDeleted nodeToBeDeleted: $scope.nodeToBeDeleted
}); });
if($scope.workflowMakerFormConfig.nodeMode === "add") {
if($scope.placeholderNode.isRoot) {
$scope.edgeFlags.showTypeOptions = false;
}
}
if ($scope.nodeToBeDeleted.isNew !== true) { if ($scope.nodeToBeDeleted.isNew !== true) {
$scope.treeData.data.deletedNodes.push($scope.nodeToBeDeleted.nodeId); $scope.treeData.data.deletedNodes.push($scope.nodeToBeDeleted.nodeId);
} }

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

@@ -86,6 +86,6 @@
</div> </div>
<div class="WorkflowMaker-buttonHolder"> <div class="WorkflowMaker-buttonHolder">
<button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> Close</button> <button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> Close</button>
<button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict"> Save</button> <button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict || workflowMakerFormConfig.nodeMode === 'add'"> Save</button>
</div> </div>
</div> </div>