Skip to content

Commit 63d3325

Browse files
committed
welcome_new can be NULL, so use "" instead of rendering "None".
- Legacy-Id: 514
1 parent 178748f commit 63d3325

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

ietf/templates/mailinglists/list_summary.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<tr><td> Administrator(s): </td><td><pre>{{ list.admins|escape }}</pre></td></tr>
1111
<tr><td> Email address(es) of initial subscriber(s) (optional): </td><td><pre>{{ list.initial_members|escape }}</pre></td></tr>
1212
<tr><td> Welcome message for initial subscriber(s) (optional): </td><td>{{ list.welcome_message|linebreaksbr }}</td></tr>
13-
<tr><td> Welcome message for new subscriber(s) (optional): </td><td>{{ list.welcome_new|linebreaksbr }}</td></tr>
13+
<tr><td> Welcome message for new subscriber(s) (optional): </td><td>{% filter linebreaksbr %}{% firstof list.welcome_new "" %}{% endfilter %}</td></tr>
1414
<tr><td> Required steps for subscription: </td><td>{{ list.get_subscription_display }}</td></tr>
1515
<tr><td> Messages to this list can be posted by:</td><td>{{ list.get_post_who_display }}</td></tr>
1616
<tr><td> Administrator approval required for posts: </td><td>{{ list.post_admin|yesno:"YES,NO" }}</td></tr>

ietf/templates/mailinglists/list_summary.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Welcome message for initial subscriber(s) (optional):
2323
{{ list.welcome_message }}
2424

2525
Welcome message for new subscriber(s) (optional):
26-
{{ list.welcome_new }}
26+
{% firstof list.welcome_new "" %}
2727

2828
Required steps for subscription: {{ list.get_subscription_display }}
2929

0 commit comments

Comments
 (0)