summaryrefslogtreecommitdiffstats
path: root/hyperkitty/views
diff options
context:
space:
mode:
Diffstat (limited to 'hyperkitty/views')
-rw-r--r--hyperkitty/views/list.py7
-rw-r--r--hyperkitty/views/thread.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index 7dbb1ad..66f7913 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -113,6 +113,13 @@ def _thread_list(request, mlist, threads, template_name='thread_list.html', extr
else:
thread.favorite = True
+ # Tags
+ try:
+ thread.tags = Tag.objects.filter(threadid=thread.thread_id,
+ list_address=mlist.name)
+ except Tag.DoesNotExist:
+ thread.tags = []
+
all_threads = threads
paginator = Paginator(threads, 10)
page_num = request.GET.get('page')
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index a1788cd..7929ac6 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -74,7 +74,7 @@ def thread_index(request, mlist_fqdn, threadid, month=None, year=None):
try:
tags = Tag.objects.filter(threadid=threadid, list_address=mlist_fqdn)
except Tag.DoesNotExist:
- tags = {}
+ tags = []
# Favorites
fav_action = "add"