From 6b6e51a66520a3949241dfa9367fc3477c5259c5 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Sat, 12 Nov 2011 04:12:23 +0000
Subject: [PATCH] Changed the AD status page to group documents by current
 state.

Fixes bug 742
 - Legacy-Id: 3599
---
 ietf/idrfc/idrfc_wrapper.py                 | 16 +++++++++++++++-
 ietf/templates/idrfc/by_ad.html             |  2 +-
 ietf/templates/submit/announce_to_lists.txt |  2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ietf/idrfc/idrfc_wrapper.py b/ietf/idrfc/idrfc_wrapper.py
index b36517e57..dd8f8c933 100644
--- a/ietf/idrfc/idrfc_wrapper.py
+++ b/ietf/idrfc/idrfc_wrapper.py
@@ -30,7 +30,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ietf.idtracker.models import InternetDraft, IDInternal, BallotInfo, IESGDiscuss, IESGLogin, DocumentComment, Acronym
+from ietf.idtracker.models import InternetDraft, IDInternal, BallotInfo, IESGDiscuss, IESGLogin, DocumentComment, Acronym, IDState
 from ietf.idrfc.models import RfcEditorQueue
 from ietf.ipr.models import IprRfc, IprDraft, IprDetail
 
@@ -578,6 +578,20 @@ class IdRfcWrapper:
         else:
             return 'Old Internet-Draft'
 
+    def view_sort_group_byad(self):
+        if self.rfc:
+            return 'RFC'
+        elif self.id.draft_status == "Active":
+            if self.id.in_ietf_process():
+               if self.id.ietf_process._idinternal.cur_state_id == IDState.DEAD:
+                   return 'IESG Dead Internet-Draft'
+               else:
+                   return "%s Internet-Draft" % self.id.ietf_process._idinternal.cur_state
+            else: 
+                return 'Active Internet-Draft'
+        else:
+            return 'Old Internet-Draft'
+
     def view_sort_key(self, sort_by=None):
         if sort_by is None:
             if self.rfc:
diff --git a/ietf/templates/idrfc/by_ad.html b/ietf/templates/idrfc/by_ad.html
index 1af0105f1..174512bf8 100644
--- a/ietf/templates/idrfc/by_ad.html
+++ b/ietf/templates/idrfc/by_ad.html
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% block content %}
 <h1>Internet-Drafts and RFCs for {{ ad_name }}</h1>
 
-{% regroup docs by view_sort_group as grouped_docs %}
+{% regroup docs by view_sort_group_byad as grouped_docs %}
 
 <table class="ietf-table ietf-doctable">
 <tr><th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ipr">ipr</th><th class="ad">Area Director</th></tr> 
diff --git a/ietf/templates/submit/announce_to_lists.txt b/ietf/templates/submit/announce_to_lists.txt
index 6b4dca129..31664ba84 100644
--- a/ietf/templates/submit/announce_to_lists.txt
+++ b/ietf/templates/submit/announce_to_lists.txt
@@ -1,3 +1,4 @@
+{% autoescape off %}
 A New Internet-Draft is available from the on-line Internet-Drafts directories.{% if submission.group_acronym %} This draft is a work item of the {{ submission.group_acronym.group_acronym.name }} Working Group of the IETF.{% endif %}
 
 	Title           : {{ submission.id_document_name }}
@@ -17,3 +18,4 @@ ftp://ftp.ietf.org/internet-drafts/
 
 This Internet-Draft can be retrieved at:
 ftp://ftp.ietf.org/internet-drafts/{{ submission.filename }}-{{ submission.revision }}.txt
+{% endautoescape %}