From 416494c7dc9539d4cb6c356588440c2c4bc42735 Mon Sep 17 00:00:00 2001
From: Jachym Cepicky <jachym.cepicky@gmail.com>
Date: Thu, 23 May 2019 17:18:57 +0200
Subject: [PATCH] fix for ticket #760 displaying followup attachments again

---
 helpdesk/templates/helpdesk/ticket.html          |  2 +-
 .../templates/helpdesk/ticket_desc_table.html    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html
index 873f8755..4a97685d 100644
--- a/helpdesk/templates/helpdesk/ticket.html
+++ b/helpdesk/templates/helpdesk/ticket.html
@@ -56,7 +56,7 @@
                             <li>{% blocktrans with change.field as field and change.old_value as old_value and change.new_value as new_value %}Changed {{ field }} from {{ old_value }} to {{ new_value }}.{% endblocktrans %}</li>
                             {% if forloop.last %}</ul></div>{% endif %}
                         {% endfor %}
-                        {% for attachment in followup.attachment_set.all %}{% if forloop.first %}<hr><div class='attachments'><ul>{% endif %}
+                        {% for attachment in followup.followupattachment_set.all %}{% if forloop.first %}<hr><div class='attachments'><ul>{% endif %}
                             <li><a href='{{ attachment.file.url }}'>{{ attachment.filename }}</a> ({{ attachment.mime_type }}, {{ attachment.size|filesizeformat }})
                             {% if followup.user and request.user == followup.user %}
                             <a href='{% url 'helpdesk:attachment_del' ticket.id attachment.id %}'><button class="btn btn-danger btn-sm"><i class="fas fa-trash"></i>&nbsp;{% trans 'Delete' %}</button></a>
diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html
index 2725753c..aea9e18c 100644
--- a/helpdesk/templates/helpdesk/ticket_desc_table.html
+++ b/helpdesk/templates/helpdesk/ticket_desc_table.html
@@ -93,6 +93,22 @@
                         <th>{% trans "Total time spent" %}</th>
                         <td>{{ ticket.time_spent }}</td>
                     </tr>
+                    <tr>
+                        <th>{% trans "Attachments" %}</th>
+                        <td>
+                            <ul>
+                            {% for followup in ticket.followup_set.all %}
+                            {% for attachment in followup.followupattachment_set.all %}
+                            <li><a href='{{ attachment.file.url }}'>{{ attachment.filename }}</a> ({{ attachment.mime_type }}, {{ attachment.size|filesizeformat }})
+                            {% if followup.user and request.user == followup.user %}
+                            <a href='{% url 'helpdesk:attachment_del' ticket.id attachment.id %}'><button class="btn btn-danger btn-sm"><i class="fas fa-trash"></i>&nbsp;{% trans 'Delete' %}</button></a>
+                            {% endif %}
+                            </li>
+                            {% endfor %}
+                            {% endfor %}
+                            </ul>
+                        </td>
+                    </tr>
                 </tbody>
             </table>
         </div>