From e13f35f088ca922fe1f0ccb5c8b45887ae06e71f Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 13 Nov 2024 11:36:30 +0000 Subject: [PATCH 1/2] Remove including core fontawesome as it causes error in logs --- .../ckan/files/patches/remove_free_fontawesome.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ckan/files/patches/remove_free_fontawesome.patch b/ansible/roles/ckan/files/patches/remove_free_fontawesome.patch index 53600442..8fee85fa 100644 --- 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 \ No newline at end of file + filters: rjsmin +@@ -39,7 +34,6 @@ bootstrap: + output: vendor/%(version)s_bootstrap.js + extra: + preload: +- - vendor/fontawesome + - vendor/jquery + contents: + - bootstrap/javascripts/bootstrap.js \ No newline at end of file From cc0e68e163c5d5624379af71e39513142b08740a Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 13 Nov 2024 11:37:12 +0000 Subject: [PATCH 2/2] Fix routes to new blueprints --- ckanext/ckanext-openapiviewer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckanext/ckanext-openapiviewer b/ckanext/ckanext-openapiviewer index f19d5f2d..e0bfdb10 160000 --- a/ckanext/ckanext-openapiviewer +++ b/ckanext/ckanext-openapiviewer @@ -1 +1 @@ -Subproject commit f19d5f2d33f1bd6b6e79aaa9befbb8b132529e32 +Subproject commit e0bfdb107999a7f4e1b27ad9cbc3fd6eb794841b