From acc18136c65da7e76a54d5da94c945c0a1a16015 Mon Sep 17 00:00:00 2001 From: Mark Calvert Date: Wed, 20 Mar 2024 10:09:05 +1300 Subject: [PATCH] Removed patch because the latest CKAN release 2.10.4 includes the fix --- ...ve_custom_org_type_in_user_activity_streams.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 ckan/patches/ckan/8020_preserve_custom_org_type_in_user_activity_streams.patch diff --git a/ckan/patches/ckan/8020_preserve_custom_org_type_in_user_activity_streams.patch b/ckan/patches/ckan/8020_preserve_custom_org_type_in_user_activity_streams.patch deleted file mode 100644 index a05ced5c..00000000 --- a/ckan/patches/ckan/8020_preserve_custom_org_type_in_user_activity_streams.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ckanext/activity/templates/snippets/stream.html b/ckanext/activity/templates/snippets/stream.html -index 52c0d4b49..270a5f22f 100644 ---- a/ckanext/activity/templates/snippets/stream.html -+++ b/ckanext/activity/templates/snippets/stream.html -@@ -14,6 +14,7 @@ - {% endmacro %} - - {% macro organization(activity) %} -+ {% set group_type = group_type or (activity.data.group.type if (activity.data.group and activity.data.group.type) else 'organization') %} - - {{ activity.data.group.title if activity.data.group else _('unknown') }} -