|
|
|
@ -7,7 +7,7 @@ from registration.signals import user_activated |
|
|
|
from ratings.models import HistoryRating |
|
|
|
from ratings.models import HistoryRating |
|
|
|
from users.models import User |
|
|
|
from users.models import User |
|
|
|
|
|
|
|
|
|
|
|
from django.core.mail import EmailMultiAlternatives |
|
|
|
from django.core.mail import EmailMultiAlternatives, EmailMessage |
|
|
|
from django.conf import settings |
|
|
|
from django.conf import settings |
|
|
|
from django.template.loader import render_to_string |
|
|
|
from django.template.loader import render_to_string |
|
|
|
|
|
|
|
|
|
|
|
@ -35,10 +35,13 @@ def login_on_activation(sender, user, request, **kwargs): |
|
|
|
# Send email |
|
|
|
# Send email |
|
|
|
from_email = getattr(settings, 'REGISTRATION_DEFAULT_FROM_EMAIL', |
|
|
|
from_email = getattr(settings, 'REGISTRATION_DEFAULT_FROM_EMAIL', |
|
|
|
settings.DEFAULT_FROM_EMAIL) |
|
|
|
settings.DEFAULT_FROM_EMAIL) |
|
|
|
message_txt = render_to_string('after_activation_email.html', |
|
|
|
message_html = render_to_string('after_activation_email.html', |
|
|
|
|
|
|
|
{"login": user.username, "password": user.raw_password}) |
|
|
|
|
|
|
|
message_txt = render_to_string('after_activation_email.txt', |
|
|
|
{"login": user.username, "password": user.raw_password}) |
|
|
|
{"login": user.username, "password": user.raw_password}) |
|
|
|
|
|
|
|
|
|
|
|
email_message = EmailMultiAlternatives("Activation complete", message_txt, from_email, [user.email]) |
|
|
|
email_message = EmailMultiAlternatives("Activation complete", message_txt, from_email, [user.email]) |
|
|
|
|
|
|
|
email_message.attach_alternative(message_html, 'text/html') |
|
|
|
email_message.send() |
|
|
|
email_message.send() |
|
|
|
|
|
|
|
|
|
|
|
# def user_registered_callback(sender, user, request, **kwargs): |
|
|
|
# def user_registered_callback(sender, user, request, **kwargs): |
|
|
|
|