ckan / ckanext-dcat

CKAN ♥ DCAT
164 stars 142 forks source link

Support CKAN 2.10 #208

Closed avdata99 closed 2 years ago

avdata99 commented 2 years ago

Adding support for CKAN 2.10.

Related to CKAN#6787

CKAN master + harvest + DCAT looks good

image

This extensions requires ckanext-harvest and Harvest#496 to be merged (I sent a PR to that PR to update it here)

With those PR merged, locally, I get all tests ok

image

amercader commented 2 years ago

@avdata99 Only one minor thing to get the <2.9 tests passing:

diff --git a/ckanext/dcat/urls.py b/ckanext/dcat/urls.py
index cd209e7..7b92535 100644
--- a/ckanext/dcat/urls.py
+++ b/ckanext/dcat/urls.py
@@ -7,7 +7,7 @@ def url_for(*args, **kwargs):
     if not tk.check_ckan_version(min_version='2.9'):

         external = kwargs.pop('_external', False)
-        if external is not None:
+        if external is not None and 'qualified' not in kwargs:
             kwargs['qualified'] = external

         if len(args) and args[0] == 'dcat.read_dataset':

Also could you replace all usage of qualified=True in url_for with _external=True? Thanks!

avdata99 commented 2 years ago

All suggestions applied @amercader The qualified=True to _external=True solved the problem

amercader commented 2 years ago

Thanks @avdata99!