extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-01-19 12:29:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #473 from tshabs/master

Browse Source 
fix mistake in helpdesk/lib.py (subject_part declared twice, second time without stripping newline)
This commit is contained in:
Jonathan Barratt 2017-01-13 14:24:58 +07:00 committed by GitHub
commit aa2265ccb1
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helpdesk/lib.py
View File

@ -82,8 +82,9 @@ def send_templated_mail(template_name,
return # just ignore if template doesn't exist return # just ignore if template doesn't exist
subject_part = from_string( subject_part = from_string(
HELPDESK_EMAIL_SUBJECT_TEMPLATE % {"subject": t.subject} HELPDESK_EMAIL_SUBJECT_TEMPLATE % {
).render(context).replace('\n', '').replace('\r', '') "subject": t.subject
}).render(context).replace('\n', '').replace('\r', '')
footer_file = os.path.join('helpdesk', locale, 'email_text_footer.txt') footer_file = os.path.join('helpdesk', locale, 'email_text_footer.txt')
@ -103,11 +104,6 @@ def send_templated_mail(template_name,
(email_html_base_file, t.heading, t.html) (email_html_base_file, t.heading, t.html)
).render(context) ).render(context)
subject_part = from_string(
HELPDESK_EMAIL_SUBJECT_TEMPLATE % {
"subject": t.subject,
}).render(context)
if isinstance(recipients, str): if isinstance(recipients, str):
if recipients.find(','): if recipients.find(','):
recipients = recipients.split(',') recipients = recipients.split(',')