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

Merged in [11501] from rjsparks@nostrum.com:

Browse source 
Change search results for recordings to link to the actual recording. Fixes #1895.
 - Legacy-Id: 11506
Note: SVN reference [11501] has been migrated to Git commit 55ef3a620f
This commit is contained in:
Henrik Levkowetz 2016-06-30 20:14:24 +00:00
parent 3e25390a1b 55ef3a620f
commit d2577a130f
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ietf/doc/models.py
View file

@ -380,15 +380,18 @@ class Document(DocumentInfo):
name = self.name
if self.type_id == "draft" and self.get_state_slug() == "rfc":
name = self.canonical_name()
elif self.type_id in ('slides','agenda','minutes','bluesheets'):
elif self.type_id in ('slides','agenda','minutes','bluesheets','recording'):
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]
if self.type_id == 'recording':
url = self.external_url
else:
filename = self.external_url
url = '%sproceedings/%s/%s/%s' % (settings.IETF_HOST_URL,meeting.number,self.type_id,filename)
if self.type_id in ('agenda','minutes'):
filename = os.path.splitext(self.external_url)[0]
else:
filename = self.external_url
url = '%sproceedings/%s/%s/%s' % (settings.IETF_HOST_URL,meeting.number,self.type_id,filename)
return url
return urlreverse('doc_view', kwargs={ 'name': name }, urlconf="ietf.urls")