From f3102cdc17cfe16ea6dc2ffbd5b1819f8bc1eebe Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sat, 3 Nov 2012 21:30:09 +0000 Subject: [PATCH] Enable diff on the conflict review history tab Fixes bug #882 - Legacy-Id: 5005 --- ietf/idrfc/views_doc.py | 5 ++++- ietf/settings.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ietf/idrfc/views_doc.py b/ietf/idrfc/views_doc.py index a650be30c..3feb98777 100644 --- a/ietf/idrfc/views_doc.py +++ b/ietf/idrfc/views_doc.py @@ -209,7 +209,7 @@ def document_history(request, name): diff_revisions = [] seen = set() - diffable = name.startswith("draft") or name.startswith("charter") + diffable = name.startswith("draft") or name.startswith("charter") or name.startswith("conflict-review") if diffable: for e in NewRevisionDocEvent.objects.filter(type="new_revision", doc__in=diff_documents).select_related('doc').order_by("-time", "-id"): @@ -220,6 +220,9 @@ def document_history(request, name): if name.startswith("charter"): h = find_history_active_at(e.doc, e.time) url = settings.CHARTER_TXT_URL + ("%s-%s.txt" % ((h or doc).canonical_name(), 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)) elif name.startswith("draft"): # rfcdiff tool has special support for IDs url = e.doc.name + "-" + e.rev diff --git a/ietf/settings.py b/ietf/settings.py index a6d940b7c..b922d3898 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -204,6 +204,7 @@ RFC_PATH = '/a/www/ietf-ftp/rfc/' CHARTER_PATH = '/a/www/ietf-ftp/charters/' 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/' AGENDA_PATH = '/a/www/www6s/proceedings/' AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext)s' MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s'