IESG Announcment list page only lists announcements with ballog_id

- Legacy-Id: 269
This commit is contained in:
Michael Lee 2007-06-08 19:21:03 +00:00
parent b16a65966e
commit 415e274dde
2 changed files with 8 additions and 4 deletions

View file

@ -16,7 +16,7 @@ def wgdocs(request,cat):
is_recent = 0
if cat == 'recent':
is_recent = 1
queryset_list = list(InternetDraft.objects.filter(b_approve_date__gte = date_threshold, intended_status__in=[1,2,6,7],idinternal__via_rfc_editor=0).order_by("-b_approve_date"))
queryset_list = InternetDraft.objects.filter(b_approve_date__gte = date_threshold, intended_status__in=[1,2,6,7],idinternal__via_rfc_editor=0).order_by("-b_approve_date")
queryset_list_doc = InternetDraft.objects.filter(b_approve_date__gte = date_threshold, intended_status__in=[3,5],idinternal__via_rfc_editor=0).order_by("-b_approve_date")
elif cat == 'previous':
queryset_list = InternetDraft.objects.filter(b_approve_date__lt = date_threshold, b_approve_date__gte = '1998-10-15', intended_status__in=[1,2,6,7]).order_by("-b_approve_date")

View file

@ -28,10 +28,12 @@ This page contains links to all IESG Protocol, Document, and Working Group Actio
<h3><a name="protocol">1. <u>Protocol Action Announcements</u></a></h3>
{% regroup object_list by b_approve_date|date:"F j, Y" as dates %}
{% for date in dates %}
<b>Date Sent: {{ date.grouper }} </b>
{% if date.list.0.idinternal.ballot_id %}<b>Date Sent: {{ date.grouper }} </b>{% endif %}
<ul>
{% for item in date.list %}
<li>{% if item.idinternal.ballot_id %}<a href="/iesg/ann/detail/{{ item.idinternal.ballot_id }}/">{% else %}<a href="http://www.ietf.org/IESG/Announcements/{{ item.filename }}.ann">{% endif %}{{ item.title }}</a>
{% if item.idinternal.ballot_id %}
<li><a href="/iesg/ann/detail/{{ item.idinternal.ballot_id }}/">{{ item.title }}</a>
{% endif %}
{% endfor %}
</ul>
{% endfor %}
@ -39,10 +41,12 @@ This page contains links to all IESG Protocol, Document, and Working Group Actio
<h3><a name="document">2. <u>Document Action Announcements</u></a></h3>
{% regroup object_list_doc by b_approve_date|date:"F j, Y" as dates %}
{% for date in dates %}
<b>Date Sent: {{ date.grouper }} </b>
{% if date.list.0.idinternal.ballot_id %}<b>Date Sent: {{ date.grouper }} </b>{% endif %}
<ul>
{% for item in date.list %}
{% if item.idinternal.ballot_id %}
<li><a href="/iesg/ann/detail/{{ item.idinternal.ballot_id }}/">{{ item.title }}</a>
{% endif %}
{% endfor %}
</ul>
{% endfor %}