Merge branch 'dlx-3.0.0' into cro

derilinx · Oct 3, 2024 · c4e455a · c4e455a
2 parents b577db6 + ae1114c
commit c4e455a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/ckanext/scheming/plugins.py b/ckanext/scheming/plugins.py
@@ -41,6 +41,7 @@
 
 ignore_missing = get_validator('ignore_missing')
 not_empty = get_validator('not_empty')
+unicode_safe = get_validator('unicode_safe')
 convert_to_extras = get_converter('convert_to_extras')
 convert_from_extras = get_converter('convert_from_extras')
 

diff --git a/ckanext/scheming/templates/scheming/organization/group_form.html b/ckanext/scheming/templates/scheming/organization/group_form.html
@@ -35,13 +35,13 @@
             {% block save_text %}
               {%- if action == "edit" -%}
                 {%- if 'humanize_entity_type' in h -%}
-                  {{ h.humanize_entity_type('organization', group_type, 'update label') }}
+                  {{ h.humanize_entity_type('organization', group_type, 'update label') or _('Update Organization') }}
                 {%- else -%}
                   {{ _('Update Organization') }}
                 {%- endif -%}
               {%- else -%}
                 {%- if 'humanize_entity_type' in h -%}
-                  {{ h.humanize_entity_type('organization', group_type, 'create label') }}
+                  {{ h.humanize_entity_type('organization', group_type, 'create label') or _('Create Organization') }}
                 {%- else -%}
                   {{ _('Create Organization') }}
                 {%- endif -%}

diff --git a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html
@@ -9,8 +9,9 @@
     'notes_translated',
     'tag_string',
     'license_id',
-    'owner_org',
-    ] -%}
+    'owner_org'
+]
+-%}
 
 {% block package_additional_info %}
   {%- for field in schema.dataset_fields -%}

diff --git a/ckanext/scheming/validation.py b/ckanext/scheming/validation.py
@@ -220,7 +220,7 @@ def validator(key, data, errors, context):
                 return value
             else:
                 try:
-                    date = h.date_str_to_datetime(value)
+                    date = datetime.datetime.fromisoformat(value)
                 except (TypeError, ValueError) as e:
                     raise Invalid(_('Date format incorrect'))
         else: