Changeset 538:1b8571fb3ff4

Timestamp:

04/04/12 16:23:41 (14 months ago)

Author:

Santiago Piccinini (SAn) <spiccinini@…>

Branch:

default

Message:

Added the optional field Sender Name to the newsletter. If this name is specified the email will be sent in the form "Sender Name <sender_email>".

Location:

cyclope/apps/newsletter

Files:

• migrations/0003_auto__add_field_newsletter_sender_name.py (added)
• models.py (modified) (1 diff)
• views.py (modified) (2 diffs)

cyclope/apps/newsletter/models.py

@@ -43 +43 @@
     header = models.TextField(verbose_name=_('header'), help_text="Text that will always be added on top of the content.", blank=True)
     layout = models.ForeignKey(Layout, verbose_name=_('layout'), help_text="Layout to use to build the resulting HTML.")
-    sender = models.EmailField(verbose_name=_('sender'), help_text="e-mail address that will be used to send the newsletter.")
+    sender_name = models.CharField(verbose_name=_('sender name'), help_text="name that will displayed as the sender of the newsletter.",  max_length=40, default="", blank=True)
+    sender = models.EmailField(verbose_name=_('sender e-mail'), help_text="e-mail address that will be used to send the newsletter.")
     test_recipients = models.CharField(verbose_name=_('test recipients'), help_text="comma separated list of test e-mail addresses", max_length=255)
     recipients = models.TextField(verbose_name=_('recipients'), help_text="comma separated list of recipient e-mail addresses")
-    
+
     def __unicode__(self):
         return self.name

cyclope/apps/newsletter/views.py

@@ -65 +65 @@
                    )
     html_message = pm.transform()
-    sender = newsletter.sender
+
     if test:
         recipients = map(strip, newsletter.test_recipients.split(','))
@@ -71 +71 @@
         recipients = map(strip, newsletter.recipients.split(','))
 
-    msg = EmailMessage(subject, html_message, sender, recipients)
+    if newsletter.sender_name:
+        from_address = "%s <%s>" % (newsletter.sender_name, newsletter.sender)
+    else:
+        from_address = newsletter.sender
+
+    msg = EmailMessage(subject, html_message, from_address, recipients)
     msg.content_subtype = "html"
     try: