More robust endpoint handling

ckan · Sep 1, 2020 · 519d353 · 519d353
1 parent db98f9b
commit 519d353
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/ckanext/dcat/plugins/__init__.py b/ckanext/dcat/plugins/__init__.py
@@ -80,6 +80,7 @@ def update_config(self, config):
     def get_helpers(self):
         return {
             'helper_available': utils.helper_available,
+            'dcat_get_endpoint': utils.get_endpoint,
         }
 
     # IActions

diff --git a/ckanext/dcat/templates/home/index.html b/ckanext/dcat/templates/home/index.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 {% block links %}
     {{ super() }}
-    {% with endpoint='dcat_catalog' if h.ckan_version() < '2.9' else 'dcat.read_catalog'  %}
+    {% with endpoint=h.dcat_get_endpoint('catalog')  %}
         <link rel="alternate" type="text/n3" href="{{ h.url_for(endpoint, _format='n3', qualified=True) }}"/>
         <link rel="alternate" type="text/ttl" href="{{ h.url_for(endpoint, _format='ttl', qualified=True) }}"/>
         <link rel="alternate" type="application/rdf+xml" href="{{ h.url_for(endpoint, _format='xml', qualified=True) }}"/>

diff --git a/ckanext/dcat/templates/package/read_base.html b/ckanext/dcat/templates/package/read_base.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 {% block links %}
     {{ super() }}
-    {% with endpoint='dcat_dataset' if h.ckan_version() < '2.9' else 'dcat.read_dataset'  %}
+    {% with endpoint=h.dcat_get_endpoint('dataset')  %}
         <link rel="alternate" type="text/n3" href="{{ h.url_for(endpoint, _id=pkg.id, _format='n3', qualified=True) }}"/>
         <link rel="alternate" type="text/ttl" href="{{ h.url_for(endpoint, _id=pkg.id, _format='ttl', qualified=True) }}"/>
         <link rel="alternate" type="application/rdf+xml" href="{{ h.url_for(endpoint, _id=pkg.id, _format='xml', qualified=True) }}"/>

diff --git a/ckanext/dcat/templates/package/search.html b/ckanext/dcat/templates/package/search.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 {% block links %}
     {{ super() }}
-    {% with endpoint='dcat_catalog' if h.ckan_version() < '2.9' else 'dcat.read_catalog'  %}
+    {% with endpoint=h.dcat_get_endpoint('catalog')  %}
         <link rel="alternate" type="text/n3" href="{{ h.url_for(endpoint, _format='n3', qualified=True) }}"/>
         <link rel="alternate" type="text/ttl" href="{{ h.url_for(endpoint, _format='ttl', qualified=True) }}"/>
         <link rel="alternate" type="application/rdf+xml" href="{{ h.url_for(endpoint, _format='xml', qualified=True) }}"/>

diff --git a/ckanext/dcat/utils.py b/ckanext/dcat/utils.py
@@ -488,3 +488,10 @@ def read_catalog_page(_format):
         response.headers['Content-type'] = CONTENT_TYPES[_format]
 
     return response
+
+
+def get_endpoint(_type='dataset'):
+    if toolkit.check_ckan_version(min_version='2.9'):
+        return 'dcat.read_dataset' if _type == 'dataset' else 'dcat.read_catalog'
+    else:
+        return 'dcat_dataset' if _type == 'dataset' else 'dcat_catalog'