forgot to update the datepicker format string in a couple of places

This commit is contained in:
arknu
2014-10-05 01:59:46 +02:00
parent eb348d60a8
commit da64215bc5
2 changed files with 2 additions and 4 deletions

View File

@@ -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 {

View File

@@ -12,9 +12,7 @@ namespace Umbraco.Web.PropertyEditors
{
_defaultPreVals = new Dictionary<string, object>
{
//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"}
};
}