Rewrite draft and RFC tabs in terms of the new schema, porting

write-up and history tabs as well
 - Legacy-Id: 5214

Author: OleLaursen

ietf/doc/utils.py

@@ -1,4 +1,4 @@
-import os
+import os, re, urllib
 from django.conf import settings
 
 # Should this move from idrfc to doc?
@@ -145,6 +145,37 @@ def augment_events_with_revision(doc, events):
 
         e.rev = cur_rev
 
+def add_links_in_new_revision_events(doc, events, diff_revisions):
+    """Add direct .txt links and diff links to new_revision events."""
+    prev = None
+
+    diff_urls = dict(((name, revision), url) for name, revision, time, url in diff_revisions)
+
+    for e in sorted(events, key=lambda e: (e.time, e.id)):
+        if not e.type == "new_revision":
+            continue
+
+        if not (e.doc.name, e.rev) in diff_urls:
+            continue
+
+        full_url = diff_url = diff_urls[(e.doc.name, e.rev)]
+
+        if doc.type_id in "draft": # work around special diff url for drafts
+            full_url = "http://tools.ietf.org/id/" + diff_url + ".txt"
+
+        # build links
+        links = r'<a href="%s">\1</a>' % full_url
+        if prev:
+            links += ""
+
+        if prev != None:
+            links += ' (<a href="http:%s?url1=%s&url2=%s">diff from previous</a>)' % (settings.RFCDIFF_PREFIX, urllib.quote(diff_url, safe="~"), urllib.quote(prev, safe="~"))
+
+        # replace the bold filename part
+        e.desc = re.sub(r"<b>(.+-[0-9][0-9].txt)</b>", links, e.desc)
+
+        prev = diff_url
+
 
 def get_document_content(key, filename, split=True, markup=True):
     f = None
@@ -153,15 +184,12 @@ def get_document_content(key, filename, split=True, markup=True):
         raw_content = f.read()
     except IOError:
         error = "Error; cannot read ("+key+")"
-        if split:
-            return (error, "")
-        else:
-            return error
+        return error
     finally:
         if f:
             f.close()
     if markup:
-        return markup_txt.markup(raw_content,split)
+        return markup_txt.markup(raw_content, split)
     else:
         return raw_content
 

ietf/idrfc/markup_txt.py

@@ -66,7 +66,8 @@ def markup(content, split=True):
     if split:
         n = content.find("\n", 5000)
         content1 = "<pre>"+content[:n+1]+"</pre>\n"
-        content2 = "<pre>"+content[n+1:]+"</pre>\n"
-        return (content1, content2)
+        return content1
+        #content2 = "<pre>"+content[n+1:]+"</pre>\n"
+        #return (content1, content2)
     else:
         return "<pre>" + content + "</pre>\n"

ietf/idrfc/utils.py

@@ -2,7 +2,7 @@
 
 from ietf.idtracker.models import InternetDraft, DocumentComment, BallotInfo, IESGLogin
 from ietf.idrfc.mails import *
-from ietf.ietfauth.decorators import has_role
+from ietf.ietfauth.utils import has_role, is_authorized_in_doc_stream
 
 def add_document_comment(request, doc, text, ballot=None):
     if request:
@@ -177,17 +177,13 @@ def update_telechatREDESIGN(request, doc, by, new_telechat_date, new_returning_i
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
     update_telechat = update_telechatREDESIGN
 
-def can_edit_intended_std_level(doc, user):
+def can_edit_intended_std_level(user, doc):
     return user.is_authenticated() and (
-        has_role(user, ["Secretariat", "Area Director"]) or
-        doc.group.role_set.filter(name__in=("chair", "auth", "delegate"), person__user=user)
-        )
+        has_role(user, ["Secretariat", "Area Director"]) or is_authorized_in_doc_stream(user, doc))
 
-def can_edit_consensus(doc, user):
+def can_edit_consensus(user, doc):
     return user.is_authenticated() and (
-        has_role(user, ["Secretariat", "Area Director"]) or
-        doc.group.role_set.filter(name__in=("chair", "auth", "delegate"), person__user=user)
-        )
+        has_role(user, ["Secretariat", "Area Director"]) or is_authorized_in_doc_stream(user, doc))
 
 def nice_consensus(consensus):
     mapping = {