Fix message formatting in IPR event history. Commit ready for merge

 - Legacy-Id: 10079

ietf/ipr/templatetags/ipr_filters.py

@@ -1,37 +1,22 @@
 # Copyright The IETF Trust 2014, All Rights Reserved
 
 from django import template
-from django.utils.safestring import mark_safe
-
+from django.utils.html import format_html
 
 register = template.Library()
 
 
-# @register.filter
-# def first_type(queryset, type):
-#     first = queryset.filter(type_id=type).first()
-#     return first.time if first else None
-
 @register.filter
 def render_message_for_history(msg):
     """Format message for display in history.  Suppress the 'To' line for incoming responses
     """
     if msg.to.startswith('ietf-ipr+'):
-        text = u'''Date: {}
-From: {}
-Subject: {}
-Cc: {}
-
-<pre>{}</pre>'''.format(msg.time,msg.frm,msg.subject,msg.cc,msg.body)
+        return format_html('Date: {}<br>From: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
+            msg.time,msg.frm,msg.subject,msg.cc,msg.body)
     else:
-        text = u'''Date: {}
-From: {}
-To: {}
-Subject: {}
-Cc: {}
+        return format_html('Date: {}<br>From: {}<br>To: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
+            msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body)
 
-<pre>{}</pre>'''.format(msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body)
-    return mark_safe(text)
 
 @register.filter
 def to_class_name(value):

ietf/templates/ipr/details_history.html

@@ -41,7 +41,7 @@ <h1>History for IPR disclosure<br><small>{{ ipr.title }}</small></h1>
           </td>
           <td>{{ e.by }}</td>
           {% if e.message %}
-            <td>{{ e.message|render_message_for_history|format_history_text:"100" }}
+            <td>{{ e.message|render_message_for_history|format_history_text:"100"|safe }}
               {% if e.response_due %}
                 <br>Response Due: {{ e.response_due|date:"Y-m-d" }}
               {% endif %}