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

more refactoring

Browse source 
- Legacy-Id: 11230
This commit is contained in:
Ryan Cross 2016-05-23 23:19:01 +00:00
parent c8f3760dbe
commit ead00565c4
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ietf/doc/models.py
View file

@ -388,15 +388,7 @@ class Document(DocumentInfo):
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)
url = '%sproceedings/%s/%s/%s' % (settings.MEDIA_URL,meeting.number,self.type_id,filename)
return url
return urlreverse('doc_view', kwargs={ 'name': name }, urlconf="ietf.urls")

2
ietf/secr/utils/meeting.py
View file

@ -28,7 +28,7 @@ def get_proceedings_path(meeting,group):
if meeting.type_id == 'ietf':
path = os.path.join(meeting.get_materials_path(),group.acronym + '.html')
elif meeting.type_id == 'interim':
path = os.path.join(meeting.get_materials.path(),'proceedings.html')
path = os.path.join(meeting.get_materials_path(),'proceedings.html')
return path
def get_proceedings_url(meeting,group=None):