Merge pull request #72 from mjanez/ckan-2.9.9
Add License and remove unnecesary patch
This commit is contained in:
commit
f447622983
|
@ -873,6 +873,15 @@ Response:
|
|||
|
||||
```
|
||||
|
||||
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
|
||||
|
||||
[^1]: Official CKAN repo: https://github.com/ckan/ckan-docker-base
|
||||
[^2]: Contains fields needed for the [ckanext-spatial geo search](https://docs.ckan.org/projects/ckanext-spatial/en/latest/spatial-search.html)
|
||||
|
|
|
@ -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 @@
|
||||
<i class="fa fa-key"></i> {{ _('API Endpoint') }}
|
||||
{% elif not res.has_views and not res.url_type == 'upload' %}
|
||||
<i class="fa fa-external-link"></i> {{ _('Go to resource') }}
|
||||
+ {% elif res.has_views and not res.url_type == 'upload' %}
|
||||
+ <i class="fa fa-external-link"></i> {{ _('Go to resource') }}
|
||||
{% else %}
|
||||
<i class="fa fa-arrow-circle-o-down"></i> {{ _('Download') }}
|
||||
{% endif %}
|
||||
</a>
|
||||
{% block download_resource_button %}
|
||||
- {% if res.datastore_active %}
|
||||
+ {% if res.datastore_active and res.url_type == 'datastore' %}
|
||||
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
@@ -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' %}
|
||||
<li>{% snippet 'package/snippets/data_api_button.html', resource=res %}</li>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -34,4 +34,4 @@
|
||||
</div>
|
||||
{% 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' %}
|
||||
<li>{% snippet 'package/snippets/data_api_button.html', resource=res %}</li>
|
||||
{% endif %}
|
||||
{% endblock %}
|
Loading…
Reference in New Issue