From cfe450b7be150f542faa2a656380a3103807a342 Mon Sep 17 00:00:00 2001
From: Akita Noek <anoek@ansible.com>
Date: Thu, 2 Jun 2016 14:01:02 -0400
Subject: [PATCH 1/3] Fixed missed refactor of function name

---
 awx/ui/client/src/helpers/JobTemplates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/helpers/JobTemplates.js b/awx/ui/client/src/helpers/JobTemplates.js
index 80242ccecd..1601429040 100644
--- a/awx/ui/client/src/helpers/JobTemplates.js
+++ b/awx/ui/client/src/helpers/JobTemplates.js
@@ -178,7 +178,7 @@ angular.module('JobTemplatesHelper', ['Utilities'])
 
 
                                   if (scope.project === "" && scope.playbook === "") {
-                                    scope.toggleScanInfo();
+                                      scope.resetProjectToDefault();
                                   }
 
                                   RelatedSearchInit({

From e0a00a8705a4218835943ee82969cf5b0dda9b17 Mon Sep 17 00:00:00 2001
From: Akita Noek <anoek@ansible.com>
Date: Thu, 2 Jun 2016 14:01:28 -0400
Subject: [PATCH 2/3] Fixed verbosity select2 syncing

 #2107
---
 .../edit/job-templates-edit.controller.js          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
index b6cfed90b6..10b8bbb885 100644
--- a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
+++ b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
@@ -399,6 +399,15 @@ export default
             });
 
             // setup verbosity options lookup
+            function sync_verbosity_select2() {
+                CreateSelect2({
+                    element:'#job_templates_verbosity',
+                    multiple: false
+                });
+            }
+            $scope.$watch('verbosity', sync_verbosity_select2);
+            sync_verbosity_select2();
+
             GetChoices({
                 scope: $scope,
                 url: defaultUrl,
@@ -460,11 +469,6 @@ export default
                                 Wait("stop");
                             });
                         });
-
-                    CreateSelect2({
-                        element:'#job_templates_verbosity',
-                        multiple: false
-                    });
                 })
                 .error(function (data, status) {
                     ProcessErrors($scope, data, status, form, {

From 93ccbdc8723b0d7b250770618bfcc426ba7fb4f8 Mon Sep 17 00:00:00 2001
From: Akita Noek <anoek@ansible.com>
Date: Thu, 2 Jun 2016 16:57:11 -0400
Subject: [PATCH 3/3] Code organization

---
 .../edit/job-templates-edit.controller.js     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
index 10b8bbb885..5f95e4e5ef 100644
--- a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
+++ b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
@@ -83,6 +83,13 @@ export default
                 });
             }
 
+            function sync_verbosity_select2() {
+                CreateSelect2({
+                    element:'#job_templates_verbosity',
+                    multiple: false
+                });
+            }
+
             getPlaybooks = function (project) {
                 var url;
                 if ($scope.playbook) {
@@ -243,6 +250,8 @@ export default
                 }
             });
 
+            // watch for changes to 'verbosity', ensure we keep our select2 in sync when it changes.
+            $scope.$watch('verbosity', sync_verbosity_select2);
 
 
             // Turn off 'Wait' after both cloud credential and playbook list come back
@@ -399,15 +408,6 @@ export default
             });
 
             // setup verbosity options lookup
-            function sync_verbosity_select2() {
-                CreateSelect2({
-                    element:'#job_templates_verbosity',
-                    multiple: false
-                });
-            }
-            $scope.$watch('verbosity', sync_verbosity_select2);
-            sync_verbosity_select2();
-
             GetChoices({
                 scope: $scope,
                 url: defaultUrl,
@@ -415,6 +415,7 @@ export default
                 variable: 'verbosity_options',
                 callback: 'choicesReady'
             });
+            sync_verbosity_select2();
 
             // setup job type options lookup
             GetChoices({