From accebf7cbf5934b8582c719c20ae492ddea1ec2b Mon Sep 17 00:00:00 2001 From: anonymous <anonymous> Date: Fri, 8 Feb 2019 12:41:52 +0100 Subject: [PATCH] fixes date for upload. hopefully doesn't break harvesting --- ckanext/odsh/plugin.py | 2 +- .../odsh/templates/package/snippets/package_basic_fields.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ckanext/odsh/plugin.py b/ckanext/odsh/plugin.py index ca6dc270..b21486a9 100644 --- a/ckanext/odsh/plugin.py +++ b/ckanext/odsh/plugin.py @@ -146,7 +146,7 @@ def odsh_validate_extra_date(key, field, data, errors, context): else: if re.match(r'\d\d\d\d-\d\d-\d\d', value): try: - dt=parse(value, dayfirst=True) + dt=parse(value) _set_value(data, field, dt.isoformat()) return except ValueError: diff --git a/ckanext/odsh/templates/package/snippets/package_basic_fields.html b/ckanext/odsh/templates/package/snippets/package_basic_fields.html index 18e2dfee..8b67ef94 100644 --- a/ckanext/odsh/templates/package/snippets/package_basic_fields.html +++ b/ckanext/odsh/templates/package/snippets/package_basic_fields.html @@ -110,7 +110,8 @@ is_required=true,placeholder=_('Enter title')) }} <!-- field issued --> {% set field = 'issued' %} - {% set value = h.odsh_extract_value_from_extras(data.extras,field) %} + {% set data_issued = h.odsh_extract_value_from_extras(data.extras,field) %} + {% set value = data_issued.split('T')[0] if data_issued else None %} {% set error = h.odsh_extract_error(field, errors) %} <div class="control-group {{ " error" if error }} control-full"> <label class="control-label" for="field-{{field}}">Veröffentlichungsdatum: <span title="Dieses Feld ist erforderlich" class="control-required">*</span> </label> -- GitLab