Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ckanext/subscribe/notification.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
1 change: 1 addition & 0 deletions ckanext/subscribe/notification_email.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions ckanext/subscribe/tests/test_notification_email.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
),
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down