holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-12-26 16:48:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes in templating engine that worked for django 1.8

Browse Source
This commit is contained in:
Alex Seeholzer 2015-06-02 16:57:52 +02:00
parent 039653cc70
commit 0b7e0b7f04
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helpdesk/lib.py
View File

@ -103,13 +103,15 @@ def send_templated_mail(template_name, email_context, recipients, sender=None, b
html_txt = html_txt.replace('\r\n', '<br>')
context['comment'] = mark_safe(html_txt)
from django.template import engines
# get_template_from_string was removed in Django 1.8 http://django.readthedocs.org/en/1.8.x/ref/templates/upgrading.html
html_part = Engine().from_string(
html_part = engines['django'].from_string(
"{%% extends '%s' %%}{%% block title %%}%s{%% endblock %%}{%% block content %%}%s{%% endblock %%}" % (email_html_base_file, t.heading, t.html)
).render(context)
# get_template_from_string was removed in Django 1.8 http://django.readthedocs.org/en/1.8.x/ref/templates/upgrading.html
subject_part = Engine().from_string(
subject_part = engines['django'].from_string(
HELPDESK_EMAIL_SUBJECT_TEMPLATE % {
"subject": t.subject,
}).render(context)

4
helpdesk/views/staff.py
View File

@ -350,8 +350,8 @@ def update_ticket(request, ticket_id, public=False):
# get_template_from_string was removed in Django 1.8 http://django.readthedocs.org/en/1.8.x/ref/templates/upgrading.html
from django.template import Engine
comment = Engine().from_string(comment).render(Context(context))
from django.template import engines
comment = engines['django'].from_string(comment).render(Context(context))
if owner is -1 and ticket.assigned_to:
owner = ticket.assigned_to.id