From b41c9e5ba340b1fdf7d294d8927ca31f91d53000 Mon Sep 17 00:00:00 2001
From: Jake McDermott <yo@jakemcdermott.me>
Date: Wed, 11 Mar 2020 07:34:58 -0400
Subject: [PATCH] Normalize initial value of select2 fields

---
 .../job-template-edit.controller.js           | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
index d27282d162..6e1bf24dd4 100644
--- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
+++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
@@ -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({