Ticket #5963: render_to_mail.diff

django/core/mail.py

@@ -314 +314 @@
         """Attach an alternative content representation."""
         self.attach(content=content, mimetype=mimetype)
 
-def send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=None, auth_password=None):
+def send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=None, auth_password=None, auto_send=True):
     """
     Easy wrapper for sending a single message to a recipient list. All members
     of the recipient list will see the other recipients in the 'To' field.
@@ -327 +327 @@
     """
     connection = SMTPConnection(username=auth_user, password=auth_password,
                                  fail_silently=fail_silently)
-    return EmailMessage(subject, message, from_email, recipient_list, connection=connection).send()
+    email_obj = EmailMessage(subject, message, from_email, recipient_list, connection=connection)
 
+    if auto_send:
+        return email_obj.send()
+
+    # Returns email message object if auto_send is not True
+    else:
+        return email_obj
+
 def send_mass_mail(datatuple, fail_silently=False, auth_user=None, auth_password=None):
     """
     Given a datatuple of (subject, message, from_email, recipient_list), sends

django/shortcuts/__init__.py

@@ -8 +8 @@
 from django.http import HttpResponse, Http404
 from django.db.models.manager import Manager
 from django.db.models.query import QuerySet
+from django.core.mail import send_mail
+from django.conf import settings
+from django.template import Context
+from django.template.loader import get_template
 
 def render_to_response(*args, **kwargs):
     """
@@ -17 +21 @@
     httpresponse_kwargs = {'mimetype': kwargs.pop('mimetype', None)}
     return HttpResponse(loader.render_to_string(*args, **kwargs), **httpresponse_kwargs)
 
+def render_to_mail(template_path, params, subject, from_email=None, recipient_list=[], auth_user=None, auth_password=None, fail_silently=False, content_subtype=None, attachments=[], **kwargs):
+    """
+    Sends a e-mail message with content parsed from a template. The syntax is 
+    the same of render_to_response function.
+    Returns then boolean of mail sending, using core.mail.send_mail function.
+    """
+    content_subtype = content_subtype or getattr(settings, 'DEFAULT_EMAIL_CONTENT_SUBTYPE', 'html')
+    from_email = from_email or getattr(settings, 'DEFAULT_FROM_EMAIL', None)
+
+    if not recipient_list:
+        return False
+
+    # Loads template for mail content
+    t = get_template(template_path)
+
+    # Render content
+    message = t.render(Context(params))
+
+    # Email object
+    email_obj = send_mail(subject, message, from_email, recipient_list, fail_silently, auth_user, auth_password)
+
+    email_obj.content_subtype = content_subtype
+
+    if attachments:
+        for att in attachments:
+            email_obj.attach_file(att)
+
+    return email_obj.send()
+
 def _get_queryset(klass):
     """
     Returns a QuerySet from a Model, Manager, or QuerySet. Created to make