External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

add workflow inventory prompt to scheduler

Browse Source
This commit is contained in:
Jake McDermott
2018-11-11 02:37:17 -05:00
parent 4ea7511ae8
commit d65687f14a
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/ui/client/src/scheduler/schedulerAdd.controller.js
View File

@@ -239,7 +239,19 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
}); });
}; };
if(!launchConf.survey_enabled) { if (!launchConf.survey_enabled &&
!launchConf.ask_inventory_on_launch &&
!launchConf.ask_credential_on_launch &&
!launchConf.ask_verbosity_on_launch &&
!launchConf.ask_job_type_on_launch &&
!launchConf.ask_limit_on_launch &&
!launchConf.ask_tags_on_launch &&
!launchConf.ask_skip_tags_on_launch &&
!launchConf.ask_diff_mode_on_launch &&
!launchConf.survey_enabled &&
!launchConf.credential_needed_to_start &&
!launchConf.inventory_needed_to_start &&
launchConf.variables_needed_to_start.length === 0) {
$scope.showPromptButton = false; $scope.showPromptButton = false;
} else { } else {
$scope.showPromptButton = true; $scope.showPromptButton = true;
@@ -259,6 +271,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
launchConf: responses[1].data, launchConf: responses[1].data,
launchOptions: responses[0].data, launchOptions: responses[0].data,
surveyQuestions: processed.surveyQuestions, surveyQuestions: processed.surveyQuestions,
templateType: ParentObject.type,
template: ParentObject.id, template: ParentObject.id,
prompts: PromptService.processPromptValues({ prompts: PromptService.processPromptValues({
launchConf: responses[1].data, launchConf: responses[1].data,
@@ -283,6 +296,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
$scope.promptData = { $scope.promptData = {
launchConf: responses[1].data, launchConf: responses[1].data,
launchOptions: responses[0].data, launchOptions: responses[0].data,
templateType: ParentObject.type,
template: ParentObject.id, template: ParentObject.id,
prompts: PromptService.processPromptValues({ prompts: PromptService.processPromptValues({
launchConf: responses[1].data, launchConf: responses[1].data,

17
awx/ui/client/src/scheduler/schedulerEdit.controller.js
View File

@@ -424,7 +424,20 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
currentValues: scheduleResolve currentValues: scheduleResolve
}); });
if(!launchConf.survey_enabled) { if (!launchConf.survey_enabled &&
!launchConf.ask_inventory_on_launch &&
!launchConf.ask_credential_on_launch &&
!launchConf.ask_verbosity_on_launch &&
!launchConf.ask_job_type_on_launch &&
!launchConf.ask_limit_on_launch &&
!launchConf.ask_tags_on_launch &&
!launchConf.ask_skip_tags_on_launch &&
!launchConf.ask_diff_mode_on_launch &&
!launchConf.survey_enabled &&
!launchConf.credential_needed_to_start &&
!launchConf.inventory_needed_to_start &&
launchConf.passwords_needed_to_start.length === 0 &&
launchConf.variables_needed_to_start.length === 0) {
$scope.showPromptButton = false; $scope.showPromptButton = false;
} else { } else {
$scope.showPromptButton = true; $scope.showPromptButton = true;
@@ -446,6 +459,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
launchOptions: launchOptions, launchOptions: launchOptions,
prompts: prompts, prompts: prompts,
surveyQuestions: surveyQuestionRes.data.spec, surveyQuestions: surveyQuestionRes.data.spec,
templateType: ParentObject.type,
template: ParentObject.id template: ParentObject.id
}; };
@@ -467,6 +481,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
launchConf: launchConf, launchConf: launchConf,
launchOptions: launchOptions, launchOptions: launchOptions,
prompts: prompts, prompts: prompts,
templateType: ParentObject.type,
template: ParentObject.id template: ParentObject.id
}; };
watchForPromptChanges(); watchForPromptChanges();