Skip to content

Display all Collection Tags on a Dataset #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phargogh merged 1 commit into from
May 1, 2026
Merged

Display all Collection Tags on a Dataset #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/ckanext-natcap/ckanext/natcap/assets/css/natcap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,3 +1365,7 @@ div#invest-model-list-container div {
padding: 1rem;
margin-top: 1rem;
}

.collection-inline {
margin-bottom: 0rem;
}
28 changes: 16 additions & 12 deletions src/ckanext-natcap/ckanext/natcap/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,18 +191,22 @@ def get_collection_name(collection_name):
return dataset.get('title', '')


def get_collection_name_url(collection_tag):
results = toolkit.get_action('package_search')(
{},
{
"fq": f'extras_collection:"{collection_tag}"',
"q": "type:collection",
"fl": "title, name",
}
)
if results['count'] > 0:
return results['results']
return None
def get_collection_name_url(collection_tags):
tag_collection_map = {}
for tag in collection_tags:
results = toolkit.get_action('package_search')(
{},
{
"fq": f'extras_collection:"{tag}"',
"q": "type:collection",
"fl": "title, name",
}
)
if results['count'] > 0:
tag_collection_map[tag] = results['results']
else:
tag_collection_map[tag] = None
return tag_collection_map


def collection_lulc_biotable(pkg):
Expand Down
34 changes: 23 additions & 11 deletions src/ckanext-natcap/ckanext/natcap/templates/package/snippets/info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,34 @@

{% block collection_info %}
{% if pkg.collection %}
{% set collection_tag = pkg.collection[0] %}
{% set collection_tags = pkg.collection %}

{% if pkg.type=='dataset' %}
{% set collection_packages = h.natcap_get_collection_name_url(collection_tag) %}
{% set collection_packages_map = h.natcap_get_collection_name_url(collection_tags) %}
<div class="collection-info">
<i class="fa fa-layer-group" aria-hidden="true"></i>
{% if not collection_packages %}
<span>This dataset is part of a collection: <a href="{% url_for 'dataset.search', vocab_collection=collection_tag %}">{{ collection_tag }}</a></span>
{% elif collection_packages|length == 1 %}
<span>This dataset is part of a collection: <a href="/collection/{{collection_packages[0]['name']}}">{{ collection_packages[0]['title'] }}</a></span>
{% if collection_tags|length == 1 %}
{% set collection_tag = collection_tags[0] %}
<span>This dataset is part of a Collection:
{% if collection_packages_map[collection_tag] %}
{% set collection_package = collection_packages_map[collection_tag][0] %}
<a href="/collection/{{collection_package['name']}}">{{ collection_package['title'] }}</a>
{% else %}
<a href="{% url_for 'dataset.search', vocab_collection=collection_tag %}">{{ collection_tag }}</a>
{% endif %}
</span>
{% else %}
<span>This dataset is part of these collections:</span>
<ul>
{% for coll_pkg in collection_packages %}
<li><a href="/collection/{{coll_pkg['name']}}">{{ coll_pkg['title'] }}</a></span>
<span>This dataset is part of the Collections:</span>
<ul class="collection-inline">
{% for tag in collection_tags %}
{% set coll_pkg = collection_packages_map[tag] %}
{% if coll_pkg %}
<li><a href="/collection/{{coll_pkg[0]['name']}}">{{ coll_pkg[0]['title'] }}</a></li>
{% else %}
<li><a href="{% url_for 'dataset.search', vocab_collection=tag %}">{{ tag }}</a></li>
{% endif %}
{% endfor %}
</ul>
</ul>
{% endif %}

{% set lulc, biotable = h.natcap_collection_lulc_biotable(pkg) %}
Expand All @@ -48,6 +59,7 @@
</div>

{% elif pkg.type=='collection' and h.natcap_collection_has_datasets(pkg.collection[0]) %}
{% set collection_tag = pkg.collection[0] %}
<div>
<a href="{% url_for 'dataset.search', vocab_collection=collection_tag %}" role="button" type="button" class="btn btn-collection btn-lg btn-block">
<i class="fa fa-layer-group" aria-hidden="true"></i>
Expand Down
17 changes: 10 additions & 7 deletions src/ckanext-natcap/ckanext/natcap/templates/snippets/package_item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,16 @@ <h2 class="dataset-heading">
{% endblock %}
{% block collection %}
{% if package.collection and package.type == 'dataset' %}
{% set collection_tag = package.collection[0] %}
{% set collection_packages = h.natcap_get_collection_name_url(collection_tag) %}
{% if not collection_packages %}
<span>This dataset is part of a Collection: <a href="{% url_for 'dataset.search', vocab_collection=collection_tag %}">{{ collection_tag }}</a></span>
{% elif collection_packages|length == 1 %}
<span>This dataset is part of a Collection: <a href="/collection/{{collection_packages[0]['name']}}" target="_blank">{{ collection_packages[0]['title'] }}</a></span>
{% endif %}
{% set collection_packages = h.natcap_get_collection_name_url(package.collection) %}
<p class="collection-inline">This dataset is part of the Collections:&nbsp;
{% for tag in package.collection %}
{% if collection_packages[tag] %}
<span><a href="/collection/{{collection_packages[tag][0]['name']}}" target="_blank">{{ tag }}&nbsp;</a></span>
{% else %}
<span><a href="{% url_for 'dataset.search', vocab_collection=tag %}">{{ tag }}&nbsp;</a></span>
{% endif %}
{% endfor %}
</p>
{% endif %}
{% endblock %}
{% block notes %}
Expand Down
Loading