From c913badafe4092e2dd01eee369c30cfa3752387e Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 22 May 2018 20:21:39 -0400
Subject: [PATCH] Fixed error changing edge type of a previous root node

---
 .../workflows/workflow-maker/workflow-maker.controller.js  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index efe7bf6642..a12f027db3 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -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) {
@@ -974,6 +973,10 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
 
         $scope.templateManuallySelected = function(selectedTemplate) {
 
+            if (surveyQuestionWatcher) {
+                surveyQuestionWatcher();
+            }
+
             if (selectedTemplate.type === "job_template") {
                 let jobTemplate = new JobTemplate();