From 04b8349895a71fa69070a2a61cf2ff8aaa8c4cdf Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Wed, 9 May 2018 16:15:02 -0700
Subject: [PATCH] fixes issues with select dropdowns

and adds a search box for the timezone select dropdown
---
 .../src/scheduler/schedulerAdd.controller.js   | 18 +++++++++++++++---
 .../src/scheduler/schedulerEdit.controller.js  |  5 +++++
 .../src/scheduler/schedulerForm.partial.html   |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index 49e143fa1a..70cf675aba 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -408,8 +408,20 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
         }
     });
 
-    CreateSelect2({
-        element: '.MakeSelect2',
-        multiple: false
+    var callSelect2 = function() {
+        CreateSelect2({
+            element: '.MakeSelect2',
+            multiple: false
+        });
+        $("#schedulerTimeZone").select2({
+            width:'100%',
+            containerCssClass: 'Form-dropDown',
+            placeholder: 'SEARCH'
+        });
+    };
+
+    $scope.$on("updateSchedulerSelects", function() {
+        callSelect2();
     });
+    callSelect2();
 }];
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 37bbf2ab6c..91f7df0e61 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -87,6 +87,11 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
             element: '.MakeSelect2',
             multiple: false
         });
+        $("#schedulerTimeZone").select2({
+            width:'100%',
+            containerCssClass: 'Form-dropDown',
+            placeholder: 'SEARCH'
+        });
     };
 
     $scope.$on("updateSchedulerSelects", function() {
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index 9313db7f71..38245c3a12 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -122,7 +122,6 @@
                 </label>
                 <select
                     ng-disabled="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd)"
-                    class="MakeSelect2"
                     name="schedulerTimeZone"
                     id="schedulerTimeZone"
                     ng-model="schedulerTimeZone"
@@ -130,6 +129,7 @@
                     required class="form-control input-sm"
                     ng-change="scheduleTimeChange()" >
                 </select>
+                <option></option>
             </div>
             <div class="form-group SchedulerForm-formGroup">
                 <label class="Form-inputLabel">