diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js index a0d2d6d8d4..56a5eff369 100644 --- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js +++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js @@ -7,11 +7,11 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait', '$scope', '$rootScope', 'CreateSelect2', 'ParseTypeChange', 'GetBasePath', 'Rest', 'ParentObject', 'JobTemplateModel', '$q', 'Empty', 'SchedulePost', - 'ProcessErrors', 'SchedulerInit', '$location', 'PromptService', 'RRuleToAPI', + 'ProcessErrors', 'SchedulerInit', '$location', 'PromptService', 'RRuleToAPI', 'moment', function($filter, $state, $stateParams, $http, Wait, $scope, $rootScope, CreateSelect2, ParseTypeChange, GetBasePath, Rest, ParentObject, JobTemplate, $q, Empty, SchedulePost, - ProcessErrors, SchedulerInit, $location, PromptService, RRuleToAPI) { + ProcessErrors, SchedulerInit, $location, PromptService, RRuleToAPI, moment) { var base = $scope.base || $location.path().replace(/^\//, '').split('/')[0], scheduler, @@ -322,12 +322,12 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait', $http.post('/api/v2/schedules/preview/', {'rrule': req}) .then(({data}) => { - $scope.preview_list = data; for (let tz in data) { $scope.preview_list.isEmpty = data[tz].length === 0; $scope.preview_list[tz] = data[tz].map(function(date) { - return date.replace(/Z/, ''); + date = date.replace(/Z/, ''); + return moment.parseZone(date).format("MM-DD-YYYY HH:mm:ss"); }); } }); diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js index 98b92470d4..0e602e9baf 100644 --- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js +++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js @@ -1,7 +1,7 @@ -export default ['$filter', '$state', '$stateParams', 'Wait', '$scope', +export default ['$filter', '$state', '$stateParams', 'Wait', '$scope', 'moment', '$rootScope', '$http', 'CreateSelect2', 'ParseTypeChange', 'ParentObject', 'ProcessErrors', 'Rest', 'GetBasePath', 'SchedulerInit', 'SchedulePost', 'JobTemplateModel', '$q', 'Empty', 'PromptService', 'RRuleToAPI', -function($filter, $state, $stateParams, Wait, $scope, +function($filter, $state, $stateParams, Wait, $scope, moment, $rootScope, $http, CreateSelect2, ParseTypeChange, ParentObject, ProcessErrors, Rest, GetBasePath, SchedulerInit, SchedulePost, JobTemplate, $q, Empty, PromptService, RRuleToAPI) { @@ -95,7 +95,8 @@ function($filter, $state, $stateParams, Wait, $scope, for (let tz in data) { $scope.preview_list.isEmpty = data[tz].length === 0; $scope.preview_list[tz] = data[tz].map(function(date) { - return date.replace(/Z/, ''); + date = date.replace(/Z/, ''); + return moment.parseZone(date).format("MM-DD-YYYY HH:mm:ss"); }); } }); diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html index ad87462d65..1d1655400a 100644 --- a/awx/ui/client/src/scheduler/schedulerForm.partial.html +++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html @@ -630,14 +630,14 @@ SchedulerFormDetail-occurrenceList" ng-show="dateChoice == 'utc'">