From 10de5b686619425158edd4ff42442d3db2a51cb0 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 26 Nov 2018 16:48:45 -0500
Subject: [PATCH] Fixes clicking on a wf in wf node.  Also fixes editing wf in
 wf node with inv prompt

---
 .../forms/workflow-node-form.controller.js               | 9 +++++++--
 .../workflow-maker/workflow-maker.controller.js          | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
index 6742e4130e..4b424b7ff4 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
@@ -223,7 +223,8 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
                     $scope.nodeFormDataLoaded = true;
                 } else if (
                     _.get($scope, 'nodeConfig.node.fullUnifiedJobTemplateObject.unified_job_type') === 'job_template' ||
-                    _.get($scope, 'nodeConfig.node.fullUnifiedJobTemplateObject.type') === 'job_template'
+                    _.get($scope, 'nodeConfig.node.fullUnifiedJobTemplateObject.type') === 'job_template' ||
+                    _.get($scope, 'nodeConfig.node.fullUnifiedJobTemplateObject.type') === 'workflow_job_template'
                 ) {
                     let promises = [jobTemplate.optionsLaunch($scope.nodeConfig.node.fullUnifiedJobTemplateObject.id), jobTemplate.getLaunch($scope.nodeConfig.node.fullUnifiedJobTemplateObject.id)];
 
@@ -274,7 +275,11 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
 
                             prompts.credentials.value = workflowNodeCredentials.concat(defaultCredsWithoutOverrides);
 
-                            if ((!$scope.nodeConfig.node.fullUnifiedJobTemplateObject.inventory && !launchConf.ask_inventory_on_launch) || !$scope.nodeConfig.node.fullUnifiedJobTemplateObject.project) {
+                            if (
+                                $scope.nodeConfig.node.fullUnifiedJobTemplateObject.type === "job_template" &&
+                                ((!$scope.nodeConfig.node.fullUnifiedJobTemplateObject.inventory && !launchConf.ask_inventory_on_launch) ||
+                                !$scope.nodeConfig.node.fullUnifiedJobTemplateObject.project)
+                            ) {
                                 $scope.selectedTemplateInvalid = true;
                             } else {
                                 $scope.selectedTemplateInvalid = false;
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 d24dc9a457..5bb597d009 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
@@ -113,7 +113,11 @@ export default ['$scope', 'TemplatesService',
                 // Check to see if the user has provided any prompt values that are different
                 // from the defaults in the job template
 
-                if (_.has(node, 'fullUnifiedJobTemplateObject') && node.fullUnifiedJobTemplateObject.type === "job_template" && node.promptData) {
+                if (_.has(node, 'fullUnifiedJobTemplateObject') &&
+                    (node.fullUnifiedJobTemplateObject.type === "workflow_job_template" ||
+                    node.fullUnifiedJobTemplateObject.type === "job_template") && 
+                    node.promptData
+                ) {
                     sendableNodeData = PromptService.bundlePromptDataForSaving({
                         promptData: node.promptData,
                         dataToSave: sendableNodeData