From fd74a30417fe5b7e707c66589cf53887c753fd1a Mon Sep 17 00:00:00 2001
From: Thorge Petersen <petersen@rz.uni-kiel.de>
Date: Wed, 15 Sep 2021 11:03:01 +0200
Subject: [PATCH] Fixup with local changes from transitional operation
---
ckanext/odsh/helpers.py | 3 +++
ckanext/odsh/templates/snippets/search_form.html | 4 ++--
ckanext/odsh/validation.py | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ckanext/odsh/helpers.py b/ckanext/odsh/helpers.py
index 672ff820..06d83e40 100644
--- a/ckanext/odsh/helpers.py
+++ b/ckanext/odsh/helpers.py
@@ -92,6 +92,9 @@ def compute_bounding_box(coords):
if len(coords) == 0:
return None
+ if type(coords[0]) != list:
+ return [coords[0], coords[0], coords[1], coords[1]]
+
coords = [c for sublist in coords for c in sublist]
if type(coords[0][0]) == list:
# multipolygon
diff --git a/ckanext/odsh/templates/snippets/search_form.html b/ckanext/odsh/templates/snippets/search_form.html
index 9e1ea9ed..b0a7b0c1 100644
--- a/ckanext/odsh/templates/snippets/search_form.html
+++ b/ckanext/odsh/templates/snippets/search_form.html
@@ -71,7 +71,7 @@
{% endblock %}
{% block search_facets %}
- {% if facets %}
+ {% if facets and facets.search %}
<p class="filter-list">
{% for field in facets.fields %}
{% set search_facets_items = facets.search.get(field)['items'] %}
@@ -202,4 +202,4 @@
{% trans %}
<p id="search-error"><strong>There was an error while searching.</strong> Please try again.</p>
{% endtrans %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py
index b5793396..1ecaee16 100644
--- a/ckanext/odsh/validation.py
+++ b/ckanext/odsh/validation.py
@@ -201,8 +201,8 @@ def known_spatial_uri(key, data, errors, context):
poly = pkg.extras.get('spatial', None)
if (not poly) and require_spatial_uri:
raise toolkit.Invalid(error_message_spatial_uri_empty)
- if has_old_uri and require_spatial_uri:
- raise toolkit.Invalid(error_message_spatial_uri_empty)
+ #if has_old_uri and require_spatial_uri:
+ # raise toolkit.Invalid(error_message_spatial_uri_empty)
else:
if poly:
new_index = next_extra_index(data)
--
GitLab