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

Merge pull request #6251 from jakemcdermott/5987-fix-sometimes-missing-verbosity-and-job-type-values

Browse Source 
Fix sometimes missing job_type and verbosity field values

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-03-13 19:30:24 +00:00
committed by GitHub
parent da48cffa12 b41c9e5ba3
commit dca335d17c
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@@ -217,6 +217,7 @@ export default
});
$scope.$watch('verbosity', sync_verbosity_select2);
$scope.$watch('job_type', sync_job_type_select2);
SurveyControllerInit({
scope: $scope,
@@ -337,10 +338,31 @@ export default
}));
}
function sync_verbosity_select2() {
function sync_verbosity_select2(newValue) {
if (newValue === 0 || (newValue && typeof newValue !== 'object')) {
$scope.verbosity = { value: newValue };
return;
}
select2LoadDefer.push(CreateSelect2({
element:'#job_template_verbosity',
multiple: false
multiple: false,
scope: $scope,
model: 'verbosity',
options: 'verbosity_options',
}));
}
function sync_job_type_select2(newValue) {
if (newValue === 0 || (newValue && typeof newValue !== 'object')) {
$scope.job_type = { value: newValue };
return;
}
select2LoadDefer.push(CreateSelect2({
element:'#job_template_job_type',
multiple: false,
scope: $scope,
model: 'job_type',
options: 'job_type_options',
}));
}
@@ -657,7 +679,6 @@ export default
variable: 'verbosity_options',
callback: 'choicesReady'
});
sync_verbosity_select2();
// setup job type options lookup
GetChoices({