External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Michael Abashian
2016-06-08 18:12:17 -04:00
parent ceea7fd62a
commit bd8c328066
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/ui/client/src/helpers/Schedules.js
View File

@@ -253,7 +253,21 @@ export default
Wait('start'); Wait('start');
$('#form-container').empty(); $('#form-container').empty();
scheduler = SchedulerInit({ scope: scope, requireFutureStartTime: false }); 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.inject('form-container', false);
scheduler.injectDetail('occurrences', false); scheduler.injectDetail('occurrences', false);
scheduler.clear(); scheduler.clear();