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

Merged in [8057] from olau@iola.dk:\n Change Document.get_absolute_url to handle case of non-meeting-based group materials, fixes #1440

Browse source 
- Legacy-Id: 8064
Note: SVN reference [8057] has been migrated to Git commit 9eba9f78d8
This commit is contained in:
Henrik Levkowetz 2014-07-13 21:40:41 +00:00
parent aefe2d70a4 9eba9f78d8
commit f07e02b462
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ietf/doc/models.py
View file

@ -247,22 +247,23 @@ class Document(DocumentInfo):
if self.type_id == "draft" and self.get_state_slug() == "rfc":
name = self.canonical_name()
elif self.type_id in ('slides','agenda','minutes'):
session = self.session_set.all()[0]
meeting = session.meeting
if self.type_id in ('agenda','minutes'):
filename = os.path.splitext(self.external_url)[0]
else:
filename = self.external_url
if meeting.type_id == 'ietf':
url = '%sproceedings/%s/%s/%s' % (settings.MEDIA_URL,meeting.number,self.type_id,filename)
elif meeting.type_id == 'interim':
url = "%sproceedings/interim/%s/%s/%s/%s" % (
settings.MEDIA_URL,
meeting.date.strftime('%Y/%m/%d'),
session.group.acronym,
self.type_id,
filename)
return url
session = self.session_set.first()
if session:
meeting = session.meeting
if self.type_id in ('agenda','minutes'):
filename = os.path.splitext(self.external_url)[0]
else:
filename = self.external_url
if meeting.type_id == 'ietf':
url = '%sproceedings/%s/%s/%s' % (settings.MEDIA_URL,meeting.number,self.type_id,filename)
elif meeting.type_id == 'interim':
url = "%sproceedings/interim/%s/%s/%s/%s" % (
settings.MEDIA_URL,
meeting.date.strftime('%Y/%m/%d'),
session.group.acronym,
self.type_id,
filename)
return url
return urlreverse('doc_view', kwargs={ 'name': name }, urlconf="ietf.urls")