Skip to content
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

Jump to bottom

Conditional DataStore Tab in Resource Edit #190

Merged
merged 7 commits into from
Feb 1, 2024
Merged

Conditional DataStore Tab in Resource Edit #190

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7c4681
feat(templates): conditional DataStore tab;
JVickery-TBS Jun 13, 2023
899e822
feat(templates): added more conditions for DataStore tab, added DataS…
JVickery-TBS Jun 14, 2023
8ff2e9f
feat(templates): added conditional DataStore action to more templates…
JVickery-TBS Jun 15, 2023
9e05f22
feat(dev): combined helpers, moved XLoaderFormats class;
JVickery-TBS Jun 16, 2023
b060bdc
Merge branch 'master' into feature/conditional-datastore-tab
JVickery-TBS Jan 29, 2024
3e3eebf
fix(templates): <=2.10 template additions, falsy url type;
JVickery-TBS Jan 29, 2024
8f8a713
fix(helpers): comments and better syntax;
JVickery-TBS Jan 31, 2024
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
6 changes: 6 additions & 0 deletions ckanext/xloader/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ def xloader_status_description(status):
return captions.get(status['status'], status['status'].capitalize())
else:
return _('Not Uploaded Yet')


def is_xloader_format(resource_format):
from ckanext.xloader.plugin import XLoaderFormats

return XLoaderFormats.is_it_an_xloader_format(resource_format)
1 change: 1 addition & 0 deletions ckanext/xloader/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,5 @@ def get_helpers(self):
return {
"xloader_status": xloader_helpers.xloader_status,
"xloader_status_description": xloader_helpers.xloader_status_description,
"is_xloader_format": xloader_helpers.is_xloader_format,
}
4 changes: 3 additions & 1 deletion ckanext/xloader/templates/package/resource_edit_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@

{% block inner_primary_nav %}
{{ super() }}
{{ h.build_nav_icon('xloader.resource_data', _('DataStore'), id=pkg.name, resource_id=res.id) }}
{% if h.is_xloader_format(res.format) or res.datastore_active %}
{{ h.build_nav_icon('xloader.resource_data', _('DataStore'), id=pkg.name, resource_id=res.id) }}
{% endif %}
{% endblock %}