From 507db4e3b6cf9a0e159b04f51559ba795f1e1d1e Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 9 May 2018 14:25:40 -0700 Subject: [PATCH] sets the UNTIL time to use the "until" that is explicitly state on the schedules endpoint GET response --- .../src/scheduler/schedulerEdit.controller.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js index f421c61a8e..37bbf2ab6c 100644 --- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js +++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js @@ -125,6 +125,21 @@ function($filter, $state, $stateParams, Wait, $scope, moment, }); } + function setUntil (scheduler) { + let { until } = scheduleResolve; + if(until !== ''){ + const date = moment(until); + const endDt = moment.parseZone(date).format("MM/DD/YYYY"); + const endHour = date.format('HH'); + const endMinute = date.format('mm'); + const endSecond = date.format('ss'); + scheduler.scope.schedulerEndDt = endDt; + scheduler.scope.schedulerEndHour = endHour; + scheduler.scope.schedulerEndMinute = endMinute; + scheduler.scope.schedulerEndSecond = endSecond; + } + } + function init() { schedule = scheduleResolve; @@ -161,6 +176,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment, scheduler.setRRule(schedule.rrule); scheduler.setName(schedule.name); setTimezone(); + setUntil(scheduler); $scope.hideForm = false; $scope.$watchGroup(["schedulerName",