From bd8c3280665d2ac4f771acd494d8c53b66e341fe Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Wed, 8 Jun 2016 18:12:17 -0400
Subject: [PATCH 1/2] Added a sanity check to make sure that
 scope.schedulerUTCTime is defined before trying to use it in
 scope.processSchedulerEndDt().  If it's not defined yet then I added a
 watcher to wait for it to get set by angular-scheduler then unbinds itself.

---
 awx/ui/client/src/helpers/Schedules.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/helpers/Schedules.js b/awx/ui/client/src/helpers/Schedules.js
index bc4fd84aff..a1ce99212c 100644
--- a/awx/ui/client/src/helpers/Schedules.js
+++ b/awx/ui/client/src/helpers/Schedules.js
@@ -253,7 +253,21 @@ export default
                 Wait('start');
                 $('#form-container').empty();
                 scheduler = SchedulerInit({ scope: scope, requireFutureStartTime: false });
-                scope.processSchedulerEndDt();
+                if(scope.schedulerUTCTime) {
+                    // The UTC time is already set
+                    scope.processSchedulerEndDt();
+                }
+                else {
+                    // We need to wait for it to be set by angular-scheduler because the folling function depends
+                    // on it
+                    var schedulerUTCTimeWatcher = scope.$watch('schedulerUTCTime', function(newVal) {
+                        if(newVal) {
+                            // Remove the watcher
+                            schedulerUTCTimeWatcher();
+                            scope.processSchedulerEndDt();
+                        }
+                    });
+                }
                 scheduler.inject('form-container', false);
                 scheduler.injectDetail('occurrences', false);
                 scheduler.clear();

From 8618fcd7b4122b45056a73cc064069d938bca527 Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Wed, 8 Jun 2016 18:27:34 -0400
Subject: [PATCH 2/2] Fixed typo

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

diff --git a/awx/ui/client/src/helpers/Schedules.js b/awx/ui/client/src/helpers/Schedules.js
index a1ce99212c..c10e89832e 100644
--- a/awx/ui/client/src/helpers/Schedules.js
+++ b/awx/ui/client/src/helpers/Schedules.js
@@ -258,7 +258,7 @@ export default
                     scope.processSchedulerEndDt();
                 }
                 else {
-                    // We need to wait for it to be set by angular-scheduler because the folling function depends
+                    // We need to wait for it to be set by angular-scheduler because the following function depends
                     // on it
                     var schedulerUTCTimeWatcher = scope.$watch('schedulerUTCTime', function(newVal) {
                         if(newVal) {