From 583d8882c55a0b5e4ae518f318a26e421f9d75f3 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Thu, 5 Apr 2018 20:34:56 +0000
Subject: [PATCH] Fixed an issue where the change of slide naming between IETF
 96 and 97 caused the datatracker to not provide correct link to pre-IETF-97
 materials.  Thanks to tjw.ietf@gmail.com for the heads-up.  - Legacy-Id:
 15017

---
 PLAN               | 3 +++
 ietf/doc/models.py | 7 ++++++-
 ietf/settings.py   | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/PLAN b/PLAN
index ccdba4632..0c2db5329 100644
--- a/PLAN
+++ b/PLAN
@@ -36,6 +36,9 @@ Planned work in rough order
 * Rework email sending so that all emails sent by the datatracker, except for
   logging and failure emails sent to ADMINS, are captured as a Message object.
 
+* Rework email subjects for messages relating to documents to consistently
+  start with the document name.
+
 * Polish the htmlization pages, making the style identical with tools.ietf.org.
 
 * Transition from the bower package manager to yarn.  Some packages are
diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index 6c6789a05..0c6aec3d5 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -213,7 +213,6 @@ class DocumentInfo(models.Model):
                     format = settings.DOC_HREFS[self.type_id]
             elif self.type_id in settings.MEETING_DOC_HREFS:
                 self.is_meeting_related = True
-                format = settings.MEETING_DOC_HREFS[self.type_id]
             else:
                 if len(self.external_url):
                     return self.external_url
@@ -229,6 +228,12 @@ class DocumentInfo(models.Model):
                     if not sess:
                         return ""
                     meeting = sess.meeting
+                # After IETF 96, meeting materials acquired revision
+                # handling, and the document naming changed.
+                if meeting.number.isdigit() and int(meeting.number) > 96:
+                    format = settings.MEETING_DOC_HREFS[self.type_id]
+                else:
+                    format = settings.MEETING_DOC_OLD_HREFS[self.type_id]
                 info = dict(doc=self, meeting=meeting)
             else:
                 info = dict(doc=self)
diff --git a/ietf/settings.py b/ietf/settings.py
index d337a6ff7..c582da0a3 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -607,6 +607,14 @@ MEETING_DOC_HREFS = {
     "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.external_url}",
 }
 
+MEETING_DOC_OLD_HREFS = {
+    "agenda": "/meeting/{meeting.number}/materials/{doc.name}",
+    "minutes": "/meeting/{meeting.number}/materials/{doc.name}",
+    "slides": "/meeting/{meeting.number}/materials/{doc.name}",
+    "recording": "{doc.external_url}",
+    "bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.external_url}",
+}
+
 # Override this in settings_local.py if needed
 CACHE_MIDDLEWARE_SECONDS = 300
 CACHE_MIDDLEWARE_KEY_PREFIX = ''