diff --git a/ckanext/subscribe/notification.py b/ckanext/subscribe/notification.py index 596e4be..3f6adf9 100644 --- a/ckanext/subscribe/notification.py +++ b/ckanext/subscribe/notification.py @@ -380,7 +380,8 @@ def send_emails(notifications_by_email, deletions_by_email): code, email, notifications, "notification" ) for email, notifications in deletions_by_email.items(): - code = email_auth.create_code(email) - notification_email.send_notification_email( - code, email, notifications, "deletion" - ) + for notification in notifications: + code = email_auth.create_code(email) + notification_email.send_notification_email( + code, email, [notification], "deletion" + ) diff --git a/ckanext/subscribe/notification_email.py b/ckanext/subscribe/notification_email.py index b85d751..92ce2a3 100644 --- a/ckanext/subscribe/notification_email.py +++ b/ckanext/subscribe/notification_email.py @@ -56,6 +56,7 @@ def get_notification_email_vars(code, email, notifications): timestamp=p.toolkit.h.date_str_to_datetime(activity["timestamp"]), dataset_link=dataset_link_from_activity(activity), dataset_href=dataset_href_from_activity(activity), + dataset_id=activity["object_id"], ) ) # get the package/group's name & title diff --git a/ckanext/subscribe/tests/test_notification_email.py b/ckanext/subscribe/tests/test_notification_email.py index f76f6b1..2fe0612 100644 --- a/ckanext/subscribe/tests/test_notification_email.py +++ b/ckanext/subscribe/tests/test_notification_email.py @@ -144,6 +144,7 @@ def test_basic(self): "activities": [ { "activity_type": u"new dataset", + "dataset_id": dataset["id"], "dataset_href": "http://test.ckan.net/dataset/{}".format( dataset["name"] ), @@ -187,6 +188,7 @@ def test_group(self): "activities": [ { "activity_type": u"new group", + "dataset_id": group["id"], "dataset_href": u"", "dataset_link": u"", "timestamp": activity.timestamp, @@ -224,6 +226,7 @@ def test_org(self): "activities": [ { "activity_type": u"new organization", + "dataset_id": org["id"], "dataset_href": u"", "dataset_link": u"", "timestamp": activity.timestamp,