Changed the AD status page to group documents by current state.

Fixes bug 742
 - Legacy-Id: 3599

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:

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> 

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 %}