Skip to content

Commit c3e81c1

Browse files
committed
Some tweaks to handle rendering django messaging framework messages a little better. Commit ready to merge.
- Legacy-Id: 10804
1 parent b1f229c commit c3e81c1

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

ietf/templates/base.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,13 @@
8484
</nav>
8585
{% endwith %}
8686
<div class="container-fluid">
87-
{% bootstrap_messages %}
87+
{% comment %} {% bootstrap_messages %} {% endcomment %}
88+
{% for message in messages %}
89+
<div class="alert{% if message.level_tag %} alert-{% if message.level_tag == 'error' %}danger{% else %}{{ message.level_tag }}{% endif %}{% endif %}{% if message.extra_tags %} {{message.extra_tags}}{% endif %} alert-dismissable">
90+
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&#215;</button>
91+
{{ message|safe }}
92+
</div>
93+
{% endfor %}
8894
{% if request.COOKIES.left_menu != "off" and not hide_menu %} {# ugly hack for the more or less unported meeting agenda edit pages #}
8995
<div class="row">
9096
<div class="col-md-2 visible-md visible-lg leftmenu">

ietf/utils/mail.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from django.core.exceptions import ImproperlyConfigured
1515
from django.template.loader import render_to_string
1616
from django.template import Context,RequestContext
17+
from django.template.defaultfilters import escape as html_escape
1718
import ietf
1819
from ietf.utils.log import log
1920
import sys
@@ -240,7 +241,7 @@ def show_that_mail_was_sent(request,leadline,msg,bcc):
240241
info += "Cc: %s\n" % msg.get('Cc')
241242
if bcc:
242243
info += "Bcc: %s\n" % bcc
243-
messages.info(request,info,extra_tags='preformatted',fail_silently=True)
244+
messages.info(request,html_escape(info),extra_tags='preformatted',fail_silently=True)
244245

245246
def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=False, bcc=None):
246247
"""Send MIME message with content already filled in."""

0 commit comments

Comments
 (0)