Django 1.9 compat.

modoboa · Apr 30, 2016 · c9109c0 · c9109c0
1 parent e71fcd2
commit c9109c0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/modoboa_webmail/templates/modoboa_webmail/attachments.html b/modoboa_webmail/templates/modoboa_webmail/attachments.html
@@ -1,4 +1,4 @@
-{% extends "common/generic_modal_form.html" %}{% load url from future %}
+{% extends "common/generic_modal_form.html" %}
 {% load i18n %}
 {% load static %}
 {% block modalbody %}

diff --git a/modoboa_webmail/templates/modoboa_webmail/compose.html b/modoboa_webmail/templates/modoboa_webmail/compose.html
@@ -1,4 +1,4 @@
-{% load i18n form_tags %}{% load url from future %}
+{% load i18n form_tags %}
 
 <form class="form-horizontal" method="POST" action="{{ posturl }}" id="composemail">
   {% csrf_token %}

diff --git a/modoboa_webmail/templates/modoboa_webmail/headers.html b/modoboa_webmail/templates/modoboa_webmail/headers.html
@@ -1,4 +1,4 @@
-{% extends "common/mailheaders.html" %}{% load i18n %}{% load url from future %}
+{% extends "common/mailheaders.html" %}{% load i18n %}
 {% block extraheaders %}{% if attachments %}
   <div class="row">
     <div class="header">{% trans "Attachments" %}</div>

diff --git a/modoboa_webmail/templates/modoboa_webmail/index.html b/modoboa_webmail/templates/modoboa_webmail/index.html
@@ -1,4 +1,4 @@
-{% extends "twocols.html" %}{% load i18n lib_tags webmail_tags %}{% load url from future %}
+{% extends "twocols.html" %}{% load i18n lib_tags webmail_tags %}
 {% load static %}
 {% block pagetitle %}Webmail{% endblock %}
 {% block extra_css %}

diff --git a/modoboa_webmail/templatetags/webmail_tags.py b/modoboa_webmail/templatetags/webmail_tags.py
@@ -1,9 +1,12 @@
 # coding: utf-8
+"""Custom template tags."""
+
 from django import template
+from django.conf import settings
+from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
+from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
-from django.conf import settings
 
 from modoboa.lib import parameters
 
@@ -173,7 +176,7 @@ def print_mailboxes(
                     mbox["sub"], selected, withunseen, selectonly, hdelimiter
             ) + "</ul>\n"
         result += "</li>\n"
-    return result
+    return mark_safe(result)
 
 
 @register.simple_tag