Merge pull request #486 from vrk-kpa/fix_issues_in_ckan_upgrade

Fix issues in ckan upgrade

ansible/roles/ckan/files/patches/remove_free_fontawesome.patch

@@ -0,0 +1,16 @@
+diff --git a/ckan/public-bs3/base/vendor/webassets.yml b/ckan/public-bs3/base/vendor/webassets.yml
+index 40e09173a..d9cc3d5d4 100644
+--- a/ckan/public-bs3/base/vendor/webassets.yml
++++ b/ckan/public-bs3/base/vendor/webassets.yml
+@@ -4,11 +4,6 @@ select2-css:
+   contents:
+     - select2/select2.css
+
+-fontawesome:
+-  output: vendor/%(version)s_fontawesome.css
+-  filters: cssrewrite
+-  contents:
+-    - fontawesome-free/css/all.css
+
+ jquery:
+   filters: rjsmin

ansible/roles/ckan/vars/main.yml

@@ -26,6 +26,7 @@ ckan_patches:
   - { file: "remove_edit_button_from_slugs" }
   - { file: "remove_gravatar" }
   - { file: "set_attachment_content_disposition" }
+  - { file: "remove_free_fontawesome" }
   - { file: "fix_updating_resource_filesize" } # https://github.com/ckan/ckan/pull/7103
   - { file: "fix_resource_delete_auth" } # https://github.com/ckan/ckan/pull/7132
 

ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/package/snippets/resource_view.html

@@ -31,20 +31,20 @@
         {% if not to_preview %}
           {% set current_filters = request.str_GET.get('filters') %}
           {% if current_filters %}
-            {% set src = h.url('dataset_resource.view', qualified=true,
+            {% set src = h.url_for('dataset_resource.view', qualified=true,
                                id=package['name'],
                                resource_id=resource['id'],
                                view_id=resource_view['id'],
                                filters=current_filters)  %}
           {% else %}
-            {% set src = h.url('dataset_resource.view', qualified=true,
+            {% set src = h.url_for('dataset_resource.view', qualified=true,
                                id=package['name'],
                                resource_id=resource['id'],
                                view_id=resource_view['id'])  %}
           {% endif %}
         {% else %}
           {# When previewing we need to stick the whole resource_view as a param as there is no other way to pass to information on to the iframe #}
-          {% set src = h.url('dataset_resource.view', qualified=true, id=package['name'], resource_id=resource['id']) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
+          {% set src = h.url_for('dataset_resource.view', qualified=true, id=package['name'], resource_id=resource['id']) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
         {% endif %}
         <div style="overflow:auto;-webkit-overflow-scrolling:touch;max-height:670px;">
           <iframe aria-label="{{ _('Data preview') }}" src="{{ src }}" frameborder="0" width="100%" data-module="data-viewer">