diff -r ddd669c54685 -r b1b5bc392a45 src/hdalab/models/renkan.py --- a/src/hdalab/models/renkan.py Sat Feb 28 06:45:26 2015 +0100 +++ b/src/hdalab/models/renkan.py Sat Feb 28 06:54:51 2015 +0100 @@ -8,16 +8,13 @@ from renkanmanager.models import Renkan from django.conf import settings -from django.core.mail import send_mail +from django.core.mail.message import EmailMultiAlternatives from django.db import models from django.db.models.signals import post_save -from django.template import loader from django.template.base import TemplateDoesNotExist -from django.template.context import Context +from django.template.loader import render_to_string +from django.utils.html import strip_tags from django.utils.translation import ugettext as _ -from django.template.loader import render_to_string -from django.core.mail.message import EmailMultiAlternatives -from django.utils.html import strip_tags logger = logging.getLogger(__name__) @@ -91,7 +88,7 @@ if msg_txt and msg_html and renkan_state.renkan and renkan_state.renkan.renkan and renkan_state.renkan.renkan.owner and renkan_state.renkan.renkan.owner.email: logger.debug("Sending following mail to %s : %s", renkan_state.renkan.renkan.owner.email, msg_txt) - emsg = EmailMultiAlternatives(subject, strip_tags(msg_txt), settings.ADMINS[0][1], [renkan_state.renkan.renkan.owner.email]) + emsg = EmailMultiAlternatives(subject, strip_tags(msg_txt), settings.DEFAULT_FROM_EMAIL, [renkan_state.renkan.renkan.owner.email]) emsg.attach_alternative(msg_html, "text/html") emsg.send(fail_silently=True)