From 95b704594d412f65bfe12e7a6955293c1e20a7cf Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Thu, 2 May 2019 12:46:30 +0200
Subject: [PATCH] fix date handling
---
ckanext/odsh/fanstatic/odsh_datepicker.js | 4 +---
ckanext/odsh/validation.py | 6 ------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/ckanext/odsh/fanstatic/odsh_datepicker.js b/ckanext/odsh/fanstatic/odsh_datepicker.js
index f4aa9e4a..e81f6e51 100644
--- a/ckanext/odsh/fanstatic/odsh_datepicker.js
+++ b/ckanext/odsh/fanstatic/odsh_datepicker.js
@@ -30,17 +30,15 @@ this.ckan.module('odsh_datepicker', function ($, _)
{
var dateString = $(ev.target).val()
var date = moment(dateString, "DD.MM.YYYY", true)
- console.log(date)
var isValid = date.isValid() && (dateString.length == 10)
if (isValid)
{
var serverDate = date.format(serverFormat);
- console.log(serverDate)
target.val(serverDate);
}
else
{
- target.val('');
+ target.val(dateString);
}
}
var onClear = function (ev)
diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py
index 7a93469f..90efa8f2 100644
--- a/ckanext/odsh/validation.py
+++ b/ckanext/odsh/validation.py
@@ -82,8 +82,6 @@ def _set_value(data, field, value):
def validate_extra_date_new(key, field, data, optional, errors):
value = _extract_value(data, field)
- print("DATE", value)
-
if not value:
if not optional:
errors[field] = 'empty'
@@ -91,15 +89,11 @@ def validate_extra_date_new(key, field, data, optional, errors):
else:
if re.match(r'\d\d\d\d-\d\d-\d\d', value):
try:
- print ("BEOFRE PARSE", value)
dt=parse(value)
- print("PARSED DATE", dt)
_set_value(data, field, dt.isoformat())
return
except ValueError:
- print('ERROR from Exception')
pass
- print('ERROR')
errors[field] = 'not a valid date'
def validate_licenseAttributionByText(key, data, errors,context):
--
GitLab