Small cleanup refactor removing redundant configuration line in settings for charter text URLs. Commit ready to merge.

 - Legacy-Id: 8150

Author: rjsparks

ietf/doc/views_doc.py

@@ -418,7 +418,7 @@ def document_main(request, name, rev=None):
                                        top=top,
                                        chartering=chartering,
                                        content=content,
-                                       txt_url=settings.CHARTER_TXT_URL + filename,
+                                       txt_url=doc.href(),
                                        revisions=revisions,
                                        snapshot=snapshot,
                                        telechat=telechat,

ietf/iesg/agenda.py

@@ -177,10 +177,7 @@ def fill_in_agenda_docs(date, sections, matches=None):
         elif doc.type_id == "conflrev":
             doc.conflictdoc = doc.relateddocument_set.get(relationship__slug='conflrev').target.document
         elif doc.type_id == "charter":
-            #if doc.group.state_id not in ("proposed", "active"):
-            #    continue
-
-            doc.group.txt_link = settings.CHARTER_TXT_URL + "%s-%s.txt" % (doc.canonical_name(), doc.rev)
+            pass
 
         number = get_doc_section(doc)
         if number: #  and num in sections

ietf/templates/iesg/agenda_charter.html

@@ -7,7 +7,7 @@
   <div>
   <div>
     <a href="{{ doc.get_absolute_url }}">{{ doc.name}}-({{doc.rev}})</a>
-    <a href="{{ settings.CHARTER_TXT_URL }}{{ doc.filename_with_rev }}">[txt]</a>
+    <a href="{{ doc.href }}">[txt]</a>
   </div>
 
   <div>{{ doc.group.name }} ({{doc.group.acronym}})</div>