Skip to content

Commit

Permalink
[#1743] Don't link to the deleted objects in "deleted" activities
Browse files Browse the repository at this point in the history
The link would either be broken or to a page for a deleted object.

Old activities of other types ("created", "updated"...) will still link
to the deleted object if it has since been deleted.
  • Loading branch information
Sean Hammond committed Feb 7, 2012
1 parent d1886ae commit 0c60e95
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/deleted_group.html
Expand Up @@ -9,7 +9,7 @@
${activity_stream_activity(
actor=h.linked_user(activity.user_id),
verb='deleted',
object="the group "+h.group_link(activity.data.group),
object="the group "+activity.data.group.name,
activity=activity
)}
</html>
2 changes: 1 addition & 1 deletion ckan/templates/activity_streams/deleted_package.html
Expand Up @@ -9,6 +9,6 @@
${activity_stream_activity(
actor=h.linked_user(activity.user_id),
verb='deleted',
object="the dataset "+h.dataset_link(activity.data.package),
object="the dataset "+h.dataset_display_name(activity.data.package),
activity=activity)}
</html>
3 changes: 1 addition & 2 deletions ckan/templates/activity_streams/deleted_resource.html
Expand Up @@ -9,8 +9,7 @@
${activity_stream_activity(
actor=h.linked_user(activity.user_id),
verb='deleted',
object='the resource '+h.resource_link(detail.data.resource,
activity.data.package.id),
object='the resource '+h.resource_display_name(detail.data.resource),
target='from the dataset '+h.dataset_link(activity.data.package),
activity=activity
)}
Expand Down

0 comments on commit 0c60e95

Please sign in to comment.