altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Fixed document methods .get_file_path() and .href() for historic meeting documents, to make urls like /doc/minutes-96-detnet/1/ work.

Browse source 
- Legacy-Id: 11912
This commit is contained in:
Henrik Levkowetz 2016-08-31 16:19:05 +00:00
parent 23d1bc4ed0
commit a939936a10
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/doc/models.py
View file

@ -80,7 +80,8 @@ class DocumentInfo(models.Model):
if self.type_id == "draft": if self.type_id == "draft":
return settings.INTERNET_DRAFT_PATH return settings.INTERNET_DRAFT_PATH
elif self.type_id in ("agenda", "minutes", "slides", "bluesheets") and self.meeting_related(): elif self.type_id in ("agenda", "minutes", "slides", "bluesheets") and self.meeting_related():
meeting = self.session_set.first().meeting doc = self.doc if isinstance(self, DocHistory) else self
meeting = doc.session_set.first().meeting
return os.path.join(meeting.get_materials_path(), self.type_id) + "/" return os.path.join(meeting.get_materials_path(), self.type_id) + "/"
elif self.type_id == "charter": elif self.type_id == "charter":
return settings.CHARTER_PATH return settings.CHARTER_PATH
@ -120,7 +121,8 @@ class DocumentInfo(models.Model):
meeting = None meeting = None
if meeting_related: if meeting_related:
meeting = self.session_set.first().meeting doc = self.doc if isinstance(self, DocHistory) else self
meeting = doc.session_set.first().meeting
return format.format(doc=self,meeting=meeting) return format.format(doc=self,meeting=meeting)