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

Merge pull request #1925 from mabashian/1902-root-edge-type

Browse Source 
Fixed error changing edge type of a previous root node
This commit is contained in:
Michael Abashian
2018-05-24 16:28:31 -04:00
committed by GitHub
parent f187210405 c913badafe
commit 6f868a7bca
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,8 +252,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
}
}
if ((params.node.originalParentId && params.parentId !== params.node.originalParentId) || params.node.originalEdge !== params.node.edgeType) {//beep
if (params.node.originalParentId && (params.parentId !== params.node.originalParentId || params.node.originalEdge !== params.node.edgeType)) {
let parentIsDeleted = false;
_.forEach($scope.treeData.data.deletedNodes, function(deletedNode) {
@@ -977,6 +976,10 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.templateManuallySelected = function(selectedTemplate) {
if (surveyQuestionWatcher) {
surveyQuestionWatcher();
}
if (selectedTemplate.type === "job_template") {
let jobTemplate = new JobTemplate();