From da64215bc581f112267235df4304889b29be7e01 Mon Sep 17 00:00:00 2001 From: arknu Date: Sun, 5 Oct 2014 01:59:46 +0200 Subject: [PATCH] forgot to update the datepicker format string in a couple of places --- .../views/propertyeditors/datepicker/datepicker.controller.js | 2 +- src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs | 4 +--- 2 files changed, 2 insertions(+), 4 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 3b030e8cb0..68d0d323dd 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 @@ -29,7 +29,7 @@ function dateTimePickerController($scope, notificationsService, assetsService, a angularHelper.safeApply($scope, function() { // when a date is changed, update the model if (e.localDate) { - if ($scope.model.config.format == "yyyy-MM-dd hh:mm:ss") { + if ($scope.model.config.format == "YYYY-MM-DD HH:mm:ss") { $scope.model.value = e.localDate.toIsoDateTimeString(); } else { diff --git a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs index ee416604d8..b368feaf8f 100644 --- a/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/DateTimePropertyEditor.cs @@ -12,9 +12,7 @@ namespace Umbraco.Web.PropertyEditors { _defaultPreVals = new Dictionary { - //NOTE: This is very important that we do not use .Net format's there, this format - // is the correct format for the JS picker we are using so you cannot capitalize the HH, they need to be 'hh' - {"format", "yyyy-MM-dd hh:mm:ss"} + {"format", "YYYY-MM-DD HH:mm:ss"} }; }