send mail to user when email subject field is blank - closes #42

Luan
1 parent fa6c79ff
Showing 2 changed files with 30 additions and 0 deletions Show diff stats
src/super_archives/management/commands/import_emails.py
src/super_archives/templates/superarchives/emails/email_blank_subject.txt
@@ -11,7 +11,10 @@ from optparse import make_option
 from django.db import transaction
 from django.template.defaultfilters import slugify
+from django.core.mail.message import EmailMessage
 from django.core.management.base import BaseCommand, CommandError
+from django.template.loader import render_to_string
+from django.utils.translation import ugettext as _
 from super_archives.models import MailingList, Message, \
                                   Thread, EmailAddress
@@ -196,6 +199,22 @@ class Command(BaseCommand, object):
             email_addr.save()
         subject = email_msg.get_subject()
+        if not subject:
+            no_subject_mail = EmailMessage(
+                subject=_(
+                    u"[Colab] Warning - Email sent with a blank subject."
+                ),
+                body=render_to_string(
+                    u'superarchives/emails/email_blank_subject.txt',
+                    {
+                        'email_body': email_msg.get_body(),
+                        'mailinglist': mailinglist.name,
+                        'user': email_addr.get_full_name()
+                    }
+                ),
+                to=[email_addr.address, ]
+            )
+            no_subject_mail.send()
         email = Message.all_objects.create(
             message_id=email_msg.get('Message-ID'),
@@ -0,0 +1,11 @@
+{% load i18n %}
+{% trans 'Hello' %} {{ user }},
+{% blocktrans with body=email_body mailinglist=mailinglist %}
+You've sent an email to {{ mailinglist }} with a blank subject and the following content:
+
+"{{ body }}"
+
+Please, fill the subject in every email you send it.
+
+Thank you.
+{% endblocktrans %}
	@@ -11,7 +11,10 @@ from optparse import make_option		@@ -11,7 +11,10 @@ from optparse import make_option
11		11
12	from django.db import transaction	12	from django.db import transaction
13	from django.template.defaultfilters import slugify	13	from django.template.defaultfilters import slugify
		14	+from django.core.mail.message import EmailMessage
14	from django.core.management.base import BaseCommand, CommandError	15	from django.core.management.base import BaseCommand, CommandError
		16	+from django.template.loader import render_to_string
		17	+from django.utils.translation import ugettext as _
15		18
16	from super_archives.models import MailingList, Message, \	19	from super_archives.models import MailingList, Message, \
17	Thread, EmailAddress	20	Thread, EmailAddress
	@@ -196,6 +199,22 @@ class Command(BaseCommand, object):		@@ -196,6 +199,22 @@ class Command(BaseCommand, object):
196	email_addr.save()	199	email_addr.save()
197		200
198	subject = email_msg.get_subject()	201	subject = email_msg.get_subject()
		202	+ if not subject:
		203	+ no_subject_mail = EmailMessage(
		204	+ subject=_(
		205	+ u"[Colab] Warning - Email sent with a blank subject."
		206	+ ),
		207	+ body=render_to_string(
		208	+ u'superarchives/emails/email_blank_subject.txt',
		209	+ {
		210	+ 'email_body': email_msg.get_body(),
		211	+ 'mailinglist': mailinglist.name,
		212	+ 'user': email_addr.get_full_name()
		213	+ }
		214	+ ),
		215	+ to=[email_addr.address, ]
		216	+ )
		217	+ no_subject_mail.send()
199		218
200	email = Message.all_objects.create(	219	email = Message.all_objects.create(
201	message_id=email_msg.get('Message-ID'),	220	message_id=email_msg.get('Message-ID'),
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+{% load i18n %}
	2	+{% trans 'Hello' %} {{ user }},
	3	+{% blocktrans with body=email_body mailinglist=mailinglist %}
	4	+You've sent an email to {{ mailinglist }} with a blank subject and the following content:
	5	+
	6	+"{{ body }}"
	7	+
	8	+Please, fill the subject in every email you send it.
	9	+
	10	+Thank you.
	11	+{% endblocktrans %}