Commit 8718d252 authored by Florian Fuchs's avatar Florian Fuchs

Merge branch 'fix-151' into 'master'

If held messages don't have a subject show 'No Subject' instead

Fixes #151

See merge request !178
parents ab2b9117 e6aa46a2
Pipeline #4319694 passed with stage
in 2 minutes and 36 seconds
......@@ -45,8 +45,15 @@
{% for msg in held_messages %}
<tr>
<td><input type="checkbox" id="id_choices_{{ forloop.counter0 }}" class="message-checkbox" name="choices" value="{{ msg.request_id }}"/></td>
<td><a href="#" class="show-modal-btn" data-msgid="{{ msg.request_id }}">{{ msg.subject }}</a>
</td>
<td>
<a href="#" class="show-modal-btn" data-msgid="{{ msg.request_id }}">
{% if msg.subject %}
{{ msg.subject }}
{% else %}
{% trans 'No Subject' %}
{% endif %}
</a>
</td>
<td>{{ msg.sender }}</td>
<td>{{ msg.reason }}</td>
<td>{{ msg.hold_date }}</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment