jesumer Escat committed c7bb2b0

Changes for registration/ on def send_activation_email()

Comments (0)

Files changed (1)


 from django.conf import settings
 from django.contrib.auth.models import User
+from django.core.mail import EmailMultiAlternatives
 from django.db import models
 from django.db import transaction
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 SHA1_RE = re.compile('^[a-f0-9]{40}$')
             framework for details regarding these objects' interfaces.
-        ctx_dict = {'activation_key': self.activation_key,
-                    'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS,
-                    'site': site}
+        ctx_dict = { 'activation_key': self.activation_key,
+                     'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS,
+                     'site': site }
         subject = render_to_string('registration/activation_email_subject.txt',
         # Email subject *must not* contain newlines
         subject = ''.join(subject.splitlines())
-        message = render_to_string('registration/activation_email.txt',
-                                   ctx_dict)
+        text_content = render_to_string('registration/activation_email.txt',
+                                    ctx_dict)
+        html_content = render_to_string('registration/activation_email.html',
+                                    ctx_dict)
-        self.user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
+        #self.user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
+        subject, from_email, to = subject, settings.DEFAULT_FROM_EMAIL,
+        msg = EmailMultiAlternatives(subject, text_content, from_email, [to])
+        msg.attach_alternative(html_content, "text/html")
+        msg.send()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.