Merge pull request #487 from vrk-kpa/more_ckan_fixes

Additional fixes for ckan upgrade
vrk-kpa · Nov 13, 2024 · 1e5da34 · 1e5da34
2 parents ddc544a + cc0e68e
commit 1e5da34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/ansible/roles/ckan/files/patches/remove_free_fontawesome.patch b/ansible/roles/ckan/files/patches/remove_free_fontawesome.patch
@@ -1,5 +1,5 @@
 diff --git a/ckan/public-bs3/base/vendor/webassets.yml b/ckan/public-bs3/base/vendor/webassets.yml
-index 40e09173a..d9cc3d5d4 100644
+index 40e09173a..393ae2cf5 100644
 --- a/ckan/public-bs3/base/vendor/webassets.yml
 +++ b/ckan/public-bs3/base/vendor/webassets.yml
 @@ -4,11 +4,6 @@ select2-css:
@@ -13,4 +13,12 @@ index 40e09173a..d9cc3d5d4 100644
 -    - fontawesome-free/css/all.css
 
  jquery:
-   filters: rjsmin
+   filters: rjsmin
+@@ -39,7 +34,6 @@ bootstrap:
+   output: vendor/%(version)s_bootstrap.js
+   extra:
+     preload:
+-      - vendor/fontawesome
+       - vendor/jquery
+   contents:
+     - bootstrap/javascripts/bootstrap.js
diff --git a/ckanext/ckanext-openapiviewer b/ckanext/ckanext-openapiviewer