From 4b39cfe913c0aacb60b517fb00b05fa380bfc2a9 Mon Sep 17 00:00:00 2001 From: Lucas Bach Bisgaard Date: Fri, 23 Sep 2022 14:36:02 +0200 Subject: [PATCH] Bug fix for datepicker with offset time (#12847) * https://github.com/umbraco/Umbraco-CMS/issues/12844 * remove "X" from ng-attr Doing the test I killed the ng-if attr. But forgot it was there doing the commit Co-authored-by: Lucas Bach Bisgaard --- .../views/propertyeditors/datepicker/datepicker.controller.js | 2 +- .../src/views/propertyeditors/datepicker/datepicker.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js index 2c13aad765..0cb8c0699c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js @@ -106,7 +106,7 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM setDate(momentDate); } setDatePickerVal(); - flatPickr.setDate($scope.model.value, false); + flatPickr.setDate($scope.model.datetimePickerValue, false); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html index 8eb71f8752..6964e995ea 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html @@ -5,7 +5,7 @@