Merge pull request #227 from brente/master

fix setting import (fixes CI error)
This commit is contained in:
Ross Poulton 2014-07-21 13:06:57 +10:00
commit 21e46f010d

View File

@ -54,6 +54,7 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
from django.template import loader, Context
from helpdesk.models import EmailTemplate
from helpdesk.settings import HELPDESK_EMAIL_SUBJECT_TEMPLATE
import os
context = Context(email_context)
@ -104,7 +105,7 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
).render(context)
subject_part = loader.get_template_from_string(
settings.HELPDESK_EMAIL_SUBJECT_TEMPLATE % {
HELPDESK_EMAIL_SUBJECT_TEMPLATE % {
"subject": t.subject,
}).render(context)