Merge pull request #487 from ckan/futureproof_version_check

Futureproof version check to work also on 3.0+
ckan · Jan 24, 2022 · ddc891f · ddc891f
2 parents b702bf9 + e650be8
commit ddc891f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ckanext/harvest/templates/base.html b/ckanext/harvest/templates/base.html
@@ -3,7 +3,7 @@
 {% block styles %}
     {{ super() }}
 
-    {% set type = 'asset' if h.ckan_version().split('.')[1] | int >= 9 else 'resource' %}
+    {% set type = 'asset' if h.ckan_version().split('.')|map('int')|list >= [2, 9, 0] else 'resource' %}
     {% include 'harvest/snippets/harvest_' ~ type ~ '.html' %}
 
 {% endblock %}
diff --git a/ckanext/harvest/templates/source/new_source_form.html b/ckanext/harvest/templates/source/new_source_form.html
@@ -1,7 +1,7 @@
 {% import 'macros/form.html' as form %}
 
 
-{% set type = 'asset' if h.ckan_version().split('.')[1] | int >= 9 else 'resource' %}
+{% set type = 'asset' if h.ckan_version().split('.')|map('int')|list >= [2, 9, 0] else 'resource' %}
 {% include 'harvest/snippets/harvest_extra_field_' ~ type ~ '.html' %}
 
 <form id="source-new" class="form-horizontal dataset-form {{ h.bootstrap_version() }}" method="post" >