From ac82271bcb091ac85f104e8e35de2db4c12d4ce8 Mon Sep 17 00:00:00 2001
From: Michael Lee <michael.lee@neustar.biz>
Date: Wed, 6 Jun 2007 05:11:06 +0000
Subject: [PATCH] Update IESG Announcement scripts to work with latest models
 and template changes.  - Legacy-Id: 247

---
 ietf/iesg/urls.py                          |  2 +-
 ietf/iesg/views.py                         |  2 +-
 ietf/templates/iesg/ballotinfo_detail.html | 11 +++++++++++
 ietf/templates/iesg/ietf_doc.html          |  4 ++--
 ietf/templates/iesg/independent_doc.html   |  4 ++--
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 ietf/templates/iesg/ballotinfo_detail.html

diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py
index 20c656d2a..952bb8487 100644
--- a/ietf/iesg/urls.py
+++ b/ietf/iesg/urls.py
@@ -25,7 +25,7 @@ urlpatterns = patterns('django.views.generic.date_based',
 
 urlpatterns += patterns('django.views.generic.list_detail',
 	(r'^telechat/detail/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset }),
-	(r'^ann/detail/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset_ann }),
+	(r'^ann/detail/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset_ann, 'template_name':"iesg/ballotinfo_detail.html" }),
 )
 
 urlpatterns += patterns('',
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 6dfc2178e..9572b4730 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -16,7 +16,7 @@ def wgdocs(request,cat):
    is_recent = 0
    if cat == 'recent':
       is_recent = 1
-      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 = 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")
diff --git a/ietf/templates/iesg/ballotinfo_detail.html b/ietf/templates/iesg/ballotinfo_detail.html
new file mode 100644
index 000000000..8bfcea756
--- /dev/null
+++ b/ietf/templates/iesg/ballotinfo_detail.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% block title %}IESG Announcement{% endblock %}
+                                                                                                                
+{% block content %}
+<pre>
+{{ object.approval_text|escape|urlize }}
+
+{{ object.ballot_writeup|escape|urlize }}
+</pre>
+{% endblock %}
+
diff --git a/ietf/templates/iesg/ietf_doc.html b/ietf/templates/iesg/ietf_doc.html
index 5337c84b4..0af6ab276 100644
--- a/ietf/templates/iesg/ietf_doc.html
+++ b/ietf/templates/iesg/ietf_doc.html
@@ -31,7 +31,7 @@ This page contains links to all IESG Protocol, Document, and Working Group Actio
 <b>Date Sent: {{ date.grouper }} </b>
 <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.id_document_name }}</a>
+<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>
 {% endfor %}
 </ul>
 {% endfor %}
@@ -42,7 +42,7 @@ This page contains links to all IESG Protocol, Document, and Working Group Actio
 <b>Date Sent: {{ date.grouper }} </b>
 <ul>
 {% for item in date.list %}
-<li><a href="/iesg/ann/detail/{{ item.idinternal.ballot_id }}/">{{ item.id_document_name }}</a>
+<li><a href="/iesg/ann/detail/{{ item.idinternal.ballot_id }}/">{{ item.title }}</a>
 {% endfor %}
 </ul>
 {% endfor %}
diff --git a/ietf/templates/iesg/independent_doc.html b/ietf/templates/iesg/independent_doc.html
index 15c588eba..71e6f7954 100644
--- a/ietf/templates/iesg/independent_doc.html
+++ b/ietf/templates/iesg/independent_doc.html
@@ -13,7 +13,7 @@ The RFC Editor receives requests to publish non-IETF Working Group documents as
 <b>Date Sent: {{ date.grouper }}</b>
 <ul>
 {% for item in date.list %}
-<li><a href="/iesg/ann/detail/{{ item.ballot_id }}/">{{ item.draft.id_document_name }}</a>
+<li><a href="/iesg/ann/detail/{{ item.ballot_id }}/">{{ item.draft.title }}</a>
 {% endfor %}
 </ul>
 {% endfor %}
@@ -26,7 +26,7 @@ The RFC Editor receives requests to publish non-IETF Working Group documents as
 <b>Date Sent: {{ date.grouper }}</b>
 <ul>
 {% for item in date.list %}
-<li><a href="/iesg/ann/detail/{{ item.ballot_id }}/">{{ item.draft.id_document_name }}</a>
+<li><a href="/iesg/ann/detail/{{ item.ballot_id }}/">{{ item.draft.title }}</a>
 {% endfor %}
 </ul>
 {% endfor %}