From 104878a6225a1f4d801d02914698bad194f7e727 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Mon, 14 Sep 2015 23:26:15 +0000 Subject: [PATCH] Fix message formatting in IPR event history. Commit ready for merge - Legacy-Id: 10079 --- ietf/ipr/templatetags/ipr_filters.py | 25 +++++-------------------- ietf/templates/ipr/details_history.html | 2 +- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/ietf/ipr/templatetags/ipr_filters.py b/ietf/ipr/templatetags/ipr_filters.py index f3110d74c..c4a8778d2 100644 --- a/ietf/ipr/templatetags/ipr_filters.py +++ b/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: {} - -
{}
'''.format(msg.time,msg.frm,msg.subject,msg.cc,msg.body) + return format_html('Date: {}
From: {}
Subject: {}
Cc: {}

{}', + msg.time,msg.frm,msg.subject,msg.cc,msg.body) else: - text = u'''Date: {} -From: {} -To: {} -Subject: {} -Cc: {} + return format_html('Date: {}
From: {}
To: {}
Subject: {}
Cc: {}

{}', + msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body) -
{}
'''.format(msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body) - return mark_safe(text) @register.filter def to_class_name(value): diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html index 4c1f82710..032434e96 100644 --- a/ietf/templates/ipr/details_history.html +++ b/ietf/templates/ipr/details_history.html @@ -41,7 +41,7 @@ {{ e.by }} {% if e.message %} - {{ e.message|render_message_for_history|format_history_text:"100" }} + {{ e.message|render_message_for_history|format_history_text:"100"|safe }} {% if e.response_due %}
Response Due: {{ e.response_due|date:"Y-m-d" }} {% endif %}