summaryrefslogtreecommitdiff
path: root/postgresqleu/mailqueue/util.py
diff options
context:
space:
mode:
authorMagnus Hagander2019-04-05 13:58:48 +0000
committerMagnus Hagander2019-04-06 09:09:27 +0000
commit5bb043c41e1d2ee2d1d026b8ecd5cc81058c59f3 (patch)
tree5859f34d249df21665042d8c11f3675acf1ab551 /postgresqleu/mailqueue/util.py
parent05aedf5fcb4ac85bd84378a468baad2413d552ca (diff)
Make the mail queue managable through the backend interface
This adds a viewer and editor for the mailqueue to the dashboard, superuser only. While at it, expose time and subject directly in the queue to make it easier to determine what is what. Most of the time this is not going to matter because emails are short-lived in the queue. But during development and definitely during debugging, it can be quite useful. Move the "parsed mail view" out of django admin and into the backend view so we don't have to maintain it twice. There is very little use for the admin view anymore, so it's OK to just show the raw data there.
Diffstat (limited to 'postgresqleu/mailqueue/util.py')
-rw-r--r--postgresqleu/mailqueue/util.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/postgresqleu/mailqueue/util.py b/postgresqleu/mailqueue/util.py
index 7fa063f4..70543ebf 100644
--- a/postgresqleu/mailqueue/util.py
+++ b/postgresqleu/mailqueue/util.py
@@ -54,7 +54,7 @@ def send_simple_mail(sender, receiver, subject, msgtxt, attachments=None, bcc=No
msg.attach(part)
# Just write it to the queue, so it will be transactionally rolled back
- QueuedMail(sender=sender, receiver=receiver, fullmsg=msg.as_string()).save()
+ QueuedMail(sender=sender, receiver=receiver, subject=subject, fullmsg=msg.as_string()).save()
# Any bcc is just entered as a separate email
if bcc:
if type(bcc) is list or type(bcc) is tuple:
@@ -63,9 +63,9 @@ def send_simple_mail(sender, receiver, subject, msgtxt, attachments=None, bcc=No
bcc = set((bcc, ))
for b in bcc:
- QueuedMail(sender=sender, receiver=b, fullmsg=msg.as_string()).save()
+ QueuedMail(sender=sender, receiver=b, subject=subject, fullmsg=msg.as_string()).save()
-def send_mail(sender, receiver, fullmsg):
+def send_mail(sender, receiver, subject, fullmsg):
# Send an email, prepared as the full MIME encoded mail already
- QueuedMail(sender=sender, receiver=receiver, fullmsg=fullmsg).save()
+ QueuedMail(sender=sender, receiver=receiver, subject=subject, fullmsg=fullmsg).save()