Skip to content

Commit 465063d

Browse files
committed
Made a template filter more robust when given unexpected input.
- Legacy-Id: 18417
1 parent 3e16da6 commit 465063d

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

ietf/ipr/templatetags/ipr_filters.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@
1212
def render_message_for_history(msg):
1313
"""Format message for display in history. Suppress the 'To' line for incoming responses
1414
"""
15-
if msg.to.startswith('ietf-ipr+'):
16-
return format_html('Date: {}<br>From: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
17-
msg.time,msg.frm,msg.subject,msg.cc,msg.body)
15+
from ietf.message.models import Message
16+
if isinstance(msg, Message):
17+
if msg.to.startswith('ietf-ipr+'):
18+
return format_html('Date: {}<br>From: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
19+
msg.time,msg.frm,msg.subject,msg.cc,msg.body)
20+
else:
21+
return format_html('Date: {}<br>From: {}<br>To: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
22+
msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body)
1823
else:
19-
return format_html('Date: {}<br>From: {}<br>To: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
20-
msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body)
21-
24+
return msg
2225

2326
@register.filter
2427
def to_class_name(value):

0 commit comments

Comments
 (0)