forked from ckan/ckan-docker
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4bc07e7
commit 4a5c626
Showing
2 changed files
with
12 additions
and
1 deletion.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
ckan/patches/ckan/8020_preserve_custom_org_type_in_user_activity_streams.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
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') %} | ||
<a href="{{ h.url_for(group_type ~ '.read', id=activity.object_id) }}"> | ||
{{ activity.data.group.title if activity.data.group else _('unknown') }} | ||
</a> |