Merged in [8204] from rjsparks@nostrum.com:

    Improves how many href urls are constructed. Updates ticket ietf-tools#1459.
 - Legacy-Id: 8310
Note: SVN reference [8204] has been migrated to Git commit ffa20b1

Author: levkowetz

ietf/doc/views_doc.py

@@ -566,11 +566,9 @@ def document_history(request, name):
             if name.startswith("charter"):
                 url = request.build_absolute_uri(urlreverse("charter_with_milestones_txt", kwargs=dict(name=e.doc.name, rev=e.rev)))
             elif name.startswith("conflict-review"):
-                h = find_history_active_at(e.doc, e.time)
-                url = settings.CONFLICT_REVIEW_TXT_URL + ("%s-%s.txt" % ((h or doc).canonical_name(), e.rev))
+                url = find_history_active_at(e.doc, e.time).href()
             elif name.startswith("status-change"):
-                h = find_history_active_at(e.doc, e.time)
-                url = settings.STATUS_CHANGE_TXT_URL + ("%s-%s.txt" % ((h or doc).canonical_name(), e.rev))
+                url = find_history_active_at(e.doc, e.time).href()
             elif name.startswith("draft") or name.startswith("rfc"):
                 # rfcdiff tool has special support for IDs
                 url = e.doc.name + "-" + e.rev

ietf/settings.py

@@ -279,11 +279,8 @@ def skip_unreadable_post(record):
 INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/'
 RFC_PATH = '/a/www/ietf-ftp/rfc/'
 CHARTER_PATH = '/a/www/ietf-ftp/charter/'
-CHARTER_TXT_URL = 'http://www.ietf.org/charter/'
 CONFLICT_REVIEW_PATH = '/a/www/ietf-ftp/conflict-reviews'
-CONFLICT_REVIEW_TXT_URL = 'http://www.ietf.org/cr/'
 STATUS_CHANGE_PATH = '/a/www/ietf-ftp/status-changes'
-STATUS_CHANGE_TXT_URL = 'http://www.ietf.org/sc/'
 AGENDA_PATH = '/a/www/www6s/proceedings/'
 IPR_DOCUMENT_PATH = '/a/www/ietf-ftp/ietf/IPR/'
 IESG_TASK_FILE = '/a/www/www6/iesg/internal/task.txt'
@@ -307,6 +304,8 @@ def skip_unreadable_post(record):
     #"liai-att": None
     #"liaison": None
     "slides": 'http://www.ietf.org/slides/{doc.name}-{doc.rev}',
+    "conflrev": "http://www.ietf.org/cr/{doc.name}-{doc.rev}.txt",
+    "statchg": "http://www.ietf.org/sc/{doc.name}-{doc.rev}.txt",
 }
 
 MEETING_DOC_HREFS = {

ietf/templates/iesg/agenda_doc.html

@@ -9,8 +9,10 @@
     {% with doc.rfc_number as rfc_number %}
     {% if rfc_number %}
     <a href="http://www.rfc-editor.org/rfc/rfc{{rfc_number}}/">[txt]</a>
-    {% else %}
+    {% elif doc.type.slug == 'draft' %}
     <a href="http://www.ietf.org/id/{{doc.name}}-{{doc.rev}}.txt">[txt]</a>
+    {% else %}
+    <a href="{{doc.href}}">[txt]</a>
     {% endif %}
     {% endwith %}