From c0e62170578616c73423bbb4c5c7eed80535da95 Mon Sep 17 00:00:00 2001 From: GauravPandey-NECI <66116382+Gauravp-NEC@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:19:08 +0530 Subject: [PATCH 1/2] Added Copying and License in README.md This PR fixes issue: https://github.com/ckan/ckan-docker/issues/77 --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index c11a3af..262bd45 100644 --- a/README.md +++ b/README.md @@ -263,3 +263,13 @@ could be used instead of ckan/ckan-base:2.10.1 ## 15. Replacing DataPusher with XLoader Check out the wiki page for this: https://github.com/ckan/ckan-docker/wiki/Replacing-DataPusher-with-XLoader + +Copying and License +------------------- + +This material is copyright (c) 2006-2023 Open Knowledge Foundation and contributors. + +It is open and licensed under the GNU Affero General Public License (AGPL) v3.0 +whose full text may be found at: + +http://www.fsf.org/licensing/licenses/agpl-3.0.html From 4b1e735fea2a95ff914239be87e4c139abfed5d0 Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:23:18 +0200 Subject: [PATCH 2/2] Remove unnecesary patch --- .../00_resourcedictionary_templates.patch | 60 ------------------- 1 file changed, 60 deletions(-) delete mode 100644 ckan/patches/ckan/00_resourcedictionary_templates.patch diff --git a/ckan/patches/ckan/00_resourcedictionary_templates.patch b/ckan/patches/ckan/00_resourcedictionary_templates.patch deleted file mode 100644 index f881ff8..0000000 --- a/ckan/patches/ckan/00_resourcedictionary_templates.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html -index 7c8c6f9..6f2342a 100644 ---- a/ckan/templates/package/resource_read.html -+++ b/ckan/templates/package/resource_read.html -@@ -40,12 +40,14 @@ - {{ _('API Endpoint') }} - {% elif not res.has_views and not res.url_type == 'upload' %} - {{ _('Go to resource') }} -+ {% elif res.has_views and not res.url_type == 'upload' %} -+ {{ _('Go to resource') }} - {% else %} - {{ _('Download') }} - {% endif %} - - {% block download_resource_button %} -- {% if res.datastore_active %} -+ {% if res.datastore_active and res.url_type == 'datastore' %} - -@@ -224,4 +226,4 @@ - {% block resource_license %} - {% snippet "snippets/social.html" %} - {% endblock %} --{% endblock %} -+{% endblock %} -\ No newline at end of file -diff --git a/ckanext/datastore/templates-bs2/package/resource_read.html b/ckanext/datastore/templates-bs2/package/resource_read.html -index 3c77876..1d856e0 100644 ---- a/ckanext/datastore/templates-bs2/package/resource_read.html -+++ b/ckanext/datastore/templates-bs2/package/resource_read.html -@@ -2,7 +2,7 @@ - - {% block resource_actions_inner %} - {{ super() }} -- {% if res.datastore_active %} -+ {% if res.datastore_active and res.url_type == 'datastore' %} -
  • {% snippet 'package/snippets/data_api_button.html', resource=res %}
  • - {% endif %} - {% endblock %} -@@ -34,4 +34,4 @@ - - {% endif %} - {{ super() }} --{% endblock %} -+{% endblock %} -\ No newline at end of file -diff --git a/ckanext/datastore/templates/package/resource_read.html b/ckanext/datastore/templates/package/resource_read.html -index 2e1fdef..9caad53 100644 ---- a/ckanext/datastore/templates/package/resource_read.html -+++ b/ckanext/datastore/templates/package/resource_read.html -@@ -2,7 +2,7 @@ - - {% block resource_actions_inner %} - {{ super() }} -- {% if res.datastore_active %} -+ {% if res.datastore_active and res.url_type == 'datastore' %} -
  • {% snippet 'package/snippets/data_api_button.html', resource=res %}
  • - {% endif %} - {% endblock %}