Merged in personal/rjs/v4.02_via_rfc containing [4356] which replaces code using the old via-rfc tag with code looking at the document stream (and more), and [4364] which adds document page counts on the future telechats page.

 - Legacy-Id: 4482
Note: SVN reference [4356] has been migrated to Git commit 4eabc03

Note: SVN reference [4364] has been migrated to Git commit b3c6652

Author: levkowetz

ietf/doc/proxy.py

@@ -407,7 +407,7 @@ def telechat_date(self):
     #via_rfc_editor = models.IntegerField(null=True, blank=True)
     @property
     def via_rfc_editor(self):
-        return bool(self.tags.filter(slug='via-rfc'))
+        return self.stream_id in ('ise','irtf')
 
     #state_change_notice_to = models.CharField(blank=True, max_length=255)
     @property

ietf/idrfc/idrfc_wrapper.py

@@ -154,19 +154,19 @@ def in_ietf_process(self):
         return self.ietf_process != None
 
     def submission(self):
-        if self._idinternal and self._idinternal.via_rfc_editor:
-            return "Via IRTF or RFC Editor"
+        
+        if self._draft.stream_id != u'ietf':
+            return self._draft.stream
 
         if self._draft.group_id == Acronym.INDIVIDUAL_SUBMITTER:
             return "Individual"
 
-        if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            if self._draft.group and self._draft.group.type_id == "area":
-                return u"Individual in %s area" % self._draft.group.acronym
+        if self._draft.group and self._draft.group.type_id == "area":
+            return u"Individual in %s area" % self._draft.group.acronym
 
         a = self.group_acronym()
         if a:
-            if settings.USE_DB_REDESIGN_PROXY_CLASSES and self._draft.stream_id == "ietf" and self._draft.get_state_slug("draft-stream-ietf") == "c-adopt":
+            if self._draft.stream_id == "ietf" and self._draft.get_state_slug("draft-stream-ietf") == "c-adopt":
                 return "candidate for <a href='/wg/%s/'>%s WG</a>" % (a, a)
 
             return "<a href='/wg/%s/'>%s WG</a>" % (a, a)
@@ -176,7 +176,7 @@ def submission(self):
 
     def search_archive(self):
 
-        if self._idinternal and self._idinternal.via_rfc_editor:
+        if self._idinternal and self._idinternal.stream in ("IRTF","ISE"):
             return "www.ietf.org/mail-archive/web/"
 
         if self._draft.group_id == Acronym.INDIVIDUAL_SUBMITTER or (settings.USE_DB_REDESIGN_PROXY_CLASSES and self._draft.group.type_id == "area"):
@@ -207,7 +207,7 @@ def stream_id(self):
         elif self.draft_name.startswith("draft-irtf-"):
             return 3
         elif self._idinternal:
-            if self._idinternal.via_rfc_editor > 0:
+            if self._idinternal.stream == "ISE":
                 return 4
             else:
                 return 1

ietf/idrfc/mails.py

@@ -142,7 +142,7 @@ def generate_approval_mail_rfc_editor(request, doc):
 DO_NOT_PUBLISH_IESG_STATES = ("nopubadw", "nopubanw")
 
 def generate_approval_mailREDESIGN(request, doc):
-    if doc.get_state_slug("draft-iesg") in DO_NOT_PUBLISH_IESG_STATES or doc.tags.filter(slug='via-rfc'):
+    if doc.get_state_slug("draft-iesg") in DO_NOT_PUBLISH_IESG_STATES or doc.stream_id in ('ise','irtf'):
         mail = generate_approval_mail_rfc_editor(request, doc)
     else:
         mail = generate_approval_mail_approved(request, doc)