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

Merge pull request #1735 from mabashian/1732-schedule

Browse Source 
Only initialize extra vars if they are promptable
This commit is contained in:
Michael Abashian 2018-05-10 09:30:51 -04:00 committed by GitHub
commit c3816a9812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,14 +92,6 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
// extra_data field is not manifested in the UI when scheduling a Management Job
if ($state.current.name === 'jobTemplateSchedules.add'){
$scope.parseType = 'yaml';
$scope.extraVars = ParentObject.extra_vars === '' ? '---' : ParentObject.extra_vars;
ParseTypeChange({
scope: $scope,
variable: 'extraVars',
parse_variable: 'parseType',
field_id: 'SchedulerForm-extraVars'
});
let jobTemplate = new JobTemplate();
@ -126,7 +118,16 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
});
};
if (!launchConf.ask_variables_on_launch) {
if (launchConf.ask_variables_on_launch) {
$scope.extraVars = ParentObject.extra_vars === '' ? '---' : ParentObject.extra_vars;
ParseTypeChange({
scope: $scope,
variable: 'extraVars',
parse_variable: 'parseType',
field_id: 'SchedulerForm-extraVars'
});
} else {
$scope.noVars = true;
}