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

Merge pull request #4628 from saito-hideki/issue/4528

Browse Source 
Fix condition to show prompt button on the schedule add/edit form

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-09-10 16:59:03 +00:00
committed by GitHub
parent 19d6941034 9d2441789e
commit d73dd02e5b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,13 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
scheduler, scheduler,
job_type; job_type;
/*
* Normally if "ask_*" checkboxes are checked in a job template settings,
* shouldShowPromptButton() returns True to show the "PROMPT" button.
* However, extra_vars("ask_variables_on_launch") does not use this and
* displays a separate text area within the add/edit page for input.
* We exclude "ask_variables_on_launch" from shouldShowPromptButton() here.
*/
const shouldShowPromptButton = (launchConf) => launchConf.survey_enabled || const shouldShowPromptButton = (launchConf) => launchConf.survey_enabled ||
launchConf.ask_inventory_on_launch || launchConf.ask_inventory_on_launch ||
launchConf.ask_credential_on_launch || launchConf.ask_credential_on_launch ||
@@ -30,7 +37,6 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
launchConf.ask_skip_tags_on_launch || launchConf.ask_skip_tags_on_launch ||
launchConf.ask_diff_mode_on_launch || launchConf.ask_diff_mode_on_launch ||
launchConf.credential_needed_to_start || launchConf.credential_needed_to_start ||
launchConf.ask_variables_on_launch ||
launchConf.ask_scm_branch_on_launch || launchConf.ask_scm_branch_on_launch ||
launchConf.variables_needed_to_start.length !== 0; launchConf.variables_needed_to_start.length !== 0;

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

@@ -10,6 +10,13 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
let schedule, scheduler, scheduleCredentials = []; let schedule, scheduler, scheduleCredentials = [];
/*
* Normally if "ask_*" checkboxes are checked in a job template settings,
* shouldShowPromptButton() returns True to show the "PROMPT" button.
* However, extra_vars("ask_variables_on_launch") does not use this and
* displays a separate text area within the add/edit page for input.
* We exclude "ask_variables_on_launch" from shouldShowPromptButton() here.
*/
const shouldShowPromptButton = (launchConf) => launchConf.survey_enabled || const shouldShowPromptButton = (launchConf) => launchConf.survey_enabled ||
launchConf.ask_inventory_on_launch || launchConf.ask_inventory_on_launch ||
launchConf.ask_credential_on_launch || launchConf.ask_credential_on_launch ||
@@ -20,7 +27,6 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
launchConf.ask_skip_tags_on_launch || launchConf.ask_skip_tags_on_launch ||
launchConf.ask_diff_mode_on_launch || launchConf.ask_diff_mode_on_launch ||
launchConf.credential_needed_to_start || launchConf.credential_needed_to_start ||
launchConf.ask_variables_on_launch ||
launchConf.ask_scm_branch_on_launch || launchConf.ask_scm_branch_on_launch ||
launchConf.passwords_needed_to_start.length !== 0 || launchConf.passwords_needed_to_start.length !== 0 ||
launchConf.variables_needed_to_start.length !== 0; launchConf.variables_needed_to_start.length !== 0;