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

pass package type through to resource creation activity item #8050

Merged
merged 3 commits into from Feb 23, 2024
Merged

pass package type through to resource creation activity item #8050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdba0bc
[QOLDEV-692] pass package type through to resource creation activity …
Feb 2, 2024
a1b3529
add changelog for #8034
ThrawnCA Feb 6, 2024
6beb6a6
Merge branch 'master' of https://github.com/ckan/ckan into github-803…
Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/8034.bugfix
View file
Open in desktop
@@ -0,0 +1 @@
Pass custom package types through to the 'new resource' activity item
2 changes: 1 addition & 1 deletion ckanext/activity/templates/package/snippets/change_item.html
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
<ul>
{% for change in changes %}
{% snippet "snippets/changes/{}.html".format(
change.type), change=change %}
change.type), change=change, pkg_dict=pkg_dict %}
<br>
{% endfor %}
</ul>
2 changes: 1 addition & 1 deletion ckanext/activity/templates/snippets/changes/new_resource.html
View file
Open in desktop
@@ -1,4 +1,4 @@
{% set dataset_type = request.view_args.package_type or 'dataset' %}
{% set dataset_type = request.view_args.package_type or pkg_dict['type'] or 'dataset' %}
{% set pkg_url = h.url_for(dataset_type ~ '.read', id=change.pkg_id) %}
{% set resource_url = h.url_for(dataset_type ~ '_resource.read', id=change.pkg_id, resource_id = change.resource_id, qualified=True) %}

Expand Down