diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index 9af1fc5fc..a8a83b110 100644 --- a/ietf/doc/views_doc.py +++ b/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, diff --git a/ietf/iesg/agenda.py b/ietf/iesg/agenda.py index ade06bc02..eb0d9f212 100644 --- a/ietf/iesg/agenda.py +++ b/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 diff --git a/ietf/templates/iesg/agenda_charter.html b/ietf/templates/iesg/agenda_charter.html index 751effe5c..065ae8e1d 100644 --- a/ietf/templates/iesg/agenda_charter.html +++ b/ietf/templates/iesg/agenda_charter.html @@ -7,7 +7,7 @@
{{ doc.name}}-({{doc.rev}}) - [txt] + [txt]
{{ doc.group.name }} ({{doc.group.acronym}})