From 23d053ea533376b11b047096713674e11a0fc8bb Mon Sep 17 00:00:00 2001
From: Tero Kivinen <kivinen@iki.fi>
Date: Wed, 15 Nov 2017 11:33:02 +0000
Subject: [PATCH] If draft name has rfcXXXX-bis or rfcXXXXbis then add rfcXXXX
 to diff context menu. Fixes #460 (7 years old ticket). Commit ready for merge
  - Legacy-Id: 14374

---
 ietf/doc/templatetags/ietf_filters.py    |  5 +++++
 ietf/templates/doc/document_history.html | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index 96162b164..fad6bb321 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -536,3 +536,8 @@ def role_names(roles):
 @register.filter()
 def zaptmp(s):
     return re.sub(r'/tmp/tmp[^/]+/', '', s)
+
+@register.filter()
+def rfcbis(s):
+    m = re.search('^.*-rfc(\d+)-?bis(-.*)?$', s)
+    return None if m is None else 'rfc' + m.group(1) 
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index 6e78a0baf..471f2d8b7 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -36,6 +36,11 @@
 	        ({{ time|date:"Y-m-d" }})
 	      </option>
 	    {% endfor %}
+	    {% if doc.name|rfcbis %}
+	      <option value="{{ doc.name|rfcbis }}">
+	        {{ doc.name|rfcbis }}
+	      </option>
+	    {% endif %}
           </select>
         </div>
       </div>
@@ -52,6 +57,11 @@
 	        ({{ time|date:"Y-m-d" }})
 	      </option>
 	    {% endfor %}
+	    {% if doc.name|rfcbis %}
+	      <option value="{{ doc.name|rfcbis }}">
+	        {{ doc.name|rfcbis }}
+	      </option>
+	    {% endif %}
           </select>
         </div>
       </div>