Skip to content

Commit 583d888

Browse files
committed
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
1 parent 6a32a36 commit 583d888

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

PLAN

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ Planned work in rough order
3636
* Rework email sending so that all emails sent by the datatracker, except for
3737
logging and failure emails sent to ADMINS, are captured as a Message object.
3838

39+
* Rework email subjects for messages relating to documents to consistently
40+
start with the document name.
41+
3942
* Polish the htmlization pages, making the style identical with tools.ietf.org.
4043

4144
* Transition from the bower package manager to yarn. Some packages are

ietf/doc/models.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ def href(self, meeting=None):
213213
format = settings.DOC_HREFS[self.type_id]
214214
elif self.type_id in settings.MEETING_DOC_HREFS:
215215
self.is_meeting_related = True
216-
format = settings.MEETING_DOC_HREFS[self.type_id]
217216
else:
218217
if len(self.external_url):
219218
return self.external_url
@@ -229,6 +228,12 @@ def href(self, meeting=None):
229228
if not sess:
230229
return ""
231230
meeting = sess.meeting
231+
# After IETF 96, meeting materials acquired revision
232+
# handling, and the document naming changed.
233+
if meeting.number.isdigit() and int(meeting.number) > 96:
234+
format = settings.MEETING_DOC_HREFS[self.type_id]
235+
else:
236+
format = settings.MEETING_DOC_OLD_HREFS[self.type_id]
232237
info = dict(doc=self, meeting=meeting)
233238
else:
234239
info = dict(doc=self)

ietf/settings.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,14 @@ def skip_unreadable_post(record):
607607
"bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.external_url}",
608608
}
609609

610+
MEETING_DOC_OLD_HREFS = {
611+
"agenda": "/meeting/{meeting.number}/materials/{doc.name}",
612+
"minutes": "/meeting/{meeting.number}/materials/{doc.name}",
613+
"slides": "/meeting/{meeting.number}/materials/{doc.name}",
614+
"recording": "{doc.external_url}",
615+
"bluesheets": "https://www.ietf.org/proceedings/{meeting.number}/bluesheets/{doc.external_url}",
616+
}
617+
610618
# Override this in settings_local.py if needed
611619
CACHE_MIDDLEWARE_SECONDS = 300
612620
CACHE_MIDDLEWARE_KEY_PREFIX = ''

0 commit comments

Comments
 (0)