From 67e5ac81b55720f652571422539499691bb0f0ec Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Mon, 23 Apr 2018 15:59:16 +0200 Subject: [PATCH] Display browser local time in retirement form Nonetheless, the retirement time will still be saved as UTC. https://bugzilla.redhat.com/show_bug.cgi?id=1565128 --- .../controllers/retirement/retirement_form_controller.js | 2 +- app/assets/javascripts/directives/datetimepicker.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/controllers/retirement/retirement_form_controller.js b/app/assets/javascripts/controllers/retirement/retirement_form_controller.js index dd4ebac2634..5fc1370c652 100644 --- a/app/assets/javascripts/controllers/retirement/retirement_form_controller.js +++ b/app/assets/javascripts/controllers/retirement/retirement_form_controller.js @@ -31,7 +31,7 @@ ManageIQ.angular.app.controller('retirementFormController', ['$http', 'objectIds var data = response.data; if (data.retirement_date != null) { - vm.retirementInfo.retirementDate = moment.utc(data.retirement_date).toDate(); + vm.retirementInfo.retirementDate = new Date(data.retirement_date); } vm.retirementInfo.retirementWarning = data.retirement_warning || ''; vm.modelCopy = _.extend({}, vm.retirementInfo); diff --git a/app/assets/javascripts/directives/datetimepicker.js b/app/assets/javascripts/directives/datetimepicker.js index dd9700e6710..74d4b2b0bde 100644 --- a/app/assets/javascripts/directives/datetimepicker.js +++ b/app/assets/javascripts/directives/datetimepicker.js @@ -49,14 +49,14 @@ ManageIQ.angular.app.directive('datetimepicker', function() { // formatter ctrl.$formatters.push(function(value) { if (value) { - return moment(value).utc().format(attr.datetimeFormat); + return moment(value).format(attr.datetimeFormat); } }); // parser ctrl.$parsers.push(function(value) { if (value) { - return moment.utc(value, attr.datetimeFormat).toDate(); + return moment(value, attr.datetimeFormat).toDate(); } return null;