From f7f1c06d80df49d1b9fd66f123ab58d41a45c95a Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 16 Jul 2018 11:11:21 -0400 Subject: [PATCH] Properly clear out prompt data when user manually changes a node's JT --- .../workflow-maker/workflow-maker.controller.js | 10 ++++++++-- 1 file changed, 8 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 6aa0e71b98..51279f2e23 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 @@ -433,10 +433,10 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService', .then(function() { $scope.closeDialog(); }).catch(({data, status}) => { - ProcessErrors($scope, data, status, null); + ProcessErrors($scope, data, status, null, {}); }); }).catch(({data, status}) => { - ProcessErrors($scope, data, status, null); + ProcessErrors($scope, data, status, null, {}); }); }; @@ -1026,6 +1026,10 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService', $scope.templateManuallySelected = function(selectedTemplate) { + if (promptWatcher) { + promptWatcher(); + } + if (surveyQuestionWatcher) { surveyQuestionWatcher(); } @@ -1034,6 +1038,8 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService', credentialsWatcher(); } + $scope.promptData = null; + if (selectedTemplate.type === "job_template") { let jobTemplate = new JobTemplate();