From 951515da2fbed97b4700d6a3991dc9df904524e8 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Mon, 19 Nov 2018 15:16:46 -0500 Subject: [PATCH] disable next and show warning when default workflow inventory is removed --- .../src/templates/prompt/prompt.controller.js | 8 ----- .../src/templates/prompt/prompt.partial.html | 2 +- .../inventory/prompt-inventory.directive.js | 32 ++++++++++++++----- .../inventory/prompt-inventory.partial.html | 3 ++ 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/awx/ui/client/src/templates/prompt/prompt.controller.js b/awx/ui/client/src/templates/prompt/prompt.controller.js index 5377efbecf..82e42ca7eb 100644 --- a/awx/ui/client/src/templates/prompt/prompt.controller.js +++ b/awx/ui/client/src/templates/prompt/prompt.controller.js @@ -15,17 +15,9 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel', scope = _scope_; ({ modal } = scope[scope.ns]); - vm.isInventoryOptional = false; - scope.$watch('vm.promptData.triggerModalOpen', () => { - vm.actionButtonClicked = false; if(vm.promptData && vm.promptData.triggerModalOpen) { - - if (vm.promptData.templateType === "workflow_job_template") { - vm.isInventoryOptional = true; - } - scope.$emit('launchModalOpen', true); vm.promptDataClone = _.cloneDeep(vm.promptData); diff --git a/awx/ui/client/src/templates/prompt/prompt.partial.html b/awx/ui/client/src/templates/prompt/prompt.partial.html index 0023ca2c9c..dc3ad632c2 100644 --- a/awx/ui/client/src/templates/prompt/prompt.partial.html +++ b/awx/ui/client/src/templates/prompt/prompt.partial.html @@ -45,7 +45,7 @@ +
+   {{ inventoryWarning }} +