From 86239cc7778135819c6697f24839bb3fb7d64c2e Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 20 Aug 2015 12:45:42 +0200 Subject: [PATCH] fixes date time picker if the format is cleared from pre-values, it will revert to default. --- .../views/propertyeditors/datepicker/datepicker.controller.js | 4 ++++ 1 file changed, 4 insertions(+) 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 6d3afd442d..e879e84acb 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 @@ -17,6 +17,10 @@ function dateTimePickerController($scope, notificationsService, assetsService, a //map the user config $scope.model.config = angular.extend(config, $scope.model.config); + //ensure the format doesn't get overwritten with an empty string + if ($scope.model.config.format === "" || $scope.model.config.format === undefined || $scope.model.config.format === null) { + $scope.model.config.format = "YYYY-MM-DD HH:mm:ss"; + } $scope.hasDatetimePickerValue = $scope.model.value ? true : false; $scope.datetimePickerValue = null;