From c085839fc5bcc61dca6b94bcfe6a65473f9f2975 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Wed, 26 Sep 2012 16:06:41 +0200
Subject: Begin attachment support

---
 hyperkitty/templates/message.html          | 9 +++++++++
 hyperkitty/templates/messages/message.html | 1 +
 hyperkitty/views/message.py                | 3 +++
 3 files changed, 13 insertions(+)

(limited to 'hyperkitty')

diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html
index 5d061e5..75770f1 100644
--- a/hyperkitty/templates/message.html
+++ b/hyperkitty/templates/message.html
@@ -9,6 +9,15 @@
 
 <section id="thread_content">
 	{% include 'messages/first_email.html' with first_mail=message %}
+
+    {% if attachments|length %}
+    <h2>Attachments</h2>
+    <ul>
+    {% for attachment in attachments %}
+        <li>{{attachment.name}} ({{attachment.content_type}}, {{attachment.size}} octets)</li>
+    {% endfor %}
+    </ul>
+    {% endif %}
 </section>
 
 {% endblock %}
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 1e8a53d..54613e0 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -21,6 +21,7 @@
 {% endif %}
 
 	{{email.content}}
+
 </div>
 
 {% if settings.USE_MOCKUPS %}
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 1594a43..0f90ed6 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -48,6 +48,8 @@ def index (request, mlist_fqdn, hashid):
     if message is None:
         raise Http404
     message.sender_email = message.sender_email.strip()
+    attachments = store.get_attachments(mlist_fqdn, message.message_id)
+
     # Extract all the votes for this message
     try:
         votes = Rating.objects.filter(messageid = hashid)
@@ -74,6 +76,7 @@ def index (request, mlist_fqdn, hashid):
         'list_address': mlist_fqdn,
         'message': message,
         'hashid' : hashid,
+        'attachments': attachments,
     })
     return HttpResponse(t.render(c))
 
-- 
cgit