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

Fixes clicking on a wf in wf node. Also fixes editing wf in wf node with inv prompt

Browse Source
This commit is contained in:
mabashian
2018-11-26 16:48:45 -05:00
parent 55dc27f243
commit 10de5b6866
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
View File

@@ -223,7 +223,8 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
$scope.nodeFormDataLoaded = true; $scope.nodeFormDataLoaded = true;
} else if ( } else if (
_.get($scope, 'nodeConfig.node.fullUnifiedJobTemplateObject.unified_job_type') === 'job_template' || _.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)]; 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); 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; $scope.selectedTemplateInvalid = true;
} else { } else {
$scope.selectedTemplateInvalid = false; $scope.selectedTemplateInvalid = false;

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

@@ -113,7 +113,11 @@ export default ['$scope', 'TemplatesService',
// Check to see if the user has provided any prompt values that are different // Check to see if the user has provided any prompt values that are different
// from the defaults in the job template // 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({ sendableNodeData = PromptService.bundlePromptDataForSaving({
promptData: node.promptData, promptData: node.promptData,
dataToSave: sendableNodeData dataToSave: sendableNodeData