more refactoring

 - Legacy-Id: 11230

Author: rpcross

ietf/doc/models.py

@@ -388,15 +388,7 @@ def get_absolute_url(self):
                     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")
 

ietf/secr/utils/meeting.py

@@ -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):