Merge pull request #8050 from qld-gov-au/github-8034-fix-package-crea…

…tion-activity-stream pass package type through to resource creation activity item
ckan · Feb 23, 2024 · 132b96e · 132b96e
2 parents c867b1f + 6beb6a6
commit 132b96e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/changes/8034.bugfix b/changes/8034.bugfix
@@ -0,0 +1 @@
+Pass custom package types through to the 'new resource' activity item
diff --git a/ckanext/activity/templates/package/snippets/change_item.html b/ckanext/activity/templates/package/snippets/change_item.html
@@ -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>
diff --git a/ckanext/activity/templates/snippets/changes/new_resource.html b/ckanext/activity/templates/snippets/changes/new_resource.html
@@ -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) %}