From: Magnus Hagander Date: Wed, 20 Jun 2018 14:28:10 +0000 (+0200) Subject: Include which lists a message is posted to in flat view X-Git-Url: http://git.postgresql.org/gitweb/static/session/%7B%7Bsession.id%7D%7D-%7B%7Bsession.title%7Cslugify%7D%7D?a=commitdiff_plain;h=e708ebeb6e692355f2bf917e5eca8c15be8e0e7c;p=pgarchives.git Include which lists a message is posted to in flat view --- diff --git a/django/archives/mailarchives/templates/message_flat.html b/django/archives/mailarchives/templates/message_flat.html index 8301982..c72496f 100644 --- a/django/archives/mailarchives/templates/message_flat.html +++ b/django/archives/mailarchives/templates/message_flat.html @@ -17,6 +17,12 @@ window.onload = load; {%block contents%} {%if not msg.hiddenstatus%}

{{msg.subject}}

+ + + + +
Lists:{%for l in lists %}{{l.listname}}{%endfor%}
+ {%endif%} {%for m in allmsg %} diff --git a/django/archives/mailarchives/views.py b/django/archives/mailarchives/views.py index 15adbfc..098ac5f 100644 --- a/django/archives/mailarchives/views.py +++ b/django/archives/mailarchives/views.py @@ -467,7 +467,7 @@ def message_flat(request, msgid): except Message.DoesNotExist: raise Http404('Message does not exist') allmsg = list(Message.objects.filter(threadid=msg.threadid).order_by('date')) - # XXX: need to get the complete list of lists! + lists = List.objects.extra(where=["listid IN (SELECT listid FROM list_threads WHERE threadid=%s)" % msg.threadid]).order_by('listname') isfirst = (msg == allmsg[0]) @@ -480,6 +480,7 @@ def message_flat(request, msgid): r = render_nav(NavContext(request), 'message_flat.html', { 'msg': msg, 'allmsg': allmsg, + 'lists': lists, 'isfirst': isfirst, }) r['X-pgthread'] = ":%s:" % msg.threadid