diff --git a/ietf/secr/proceedings/models.py b/ietf/secr/proceedings/models.py index 9e77a8b2a..0e3001a65 100644 --- a/ietf/secr/proceedings/models.py +++ b/ietf/secr/proceedings/models.py @@ -49,10 +49,9 @@ class InterimMeeting(Meeting): If the proceedings file doesn't exist return empty string. For use in templates. ''' if os.path.exists(self.get_proceedings_path()): - url = "%sproceedings/interim/%s/%s/proceedings.html" % ( + url = "%sproceedings/%s/proceedings.html" % ( settings.IETF_HOST_URL, - self.date.strftime('%Y/%m/%d'), - self.group().acronym) + self.number) return url else: return '' diff --git a/ietf/secr/utils/meeting.py b/ietf/secr/utils/meeting.py index a6558fa18..d6d2a67b4 100644 --- a/ietf/secr/utils/meeting.py +++ b/ietf/secr/utils/meeting.py @@ -35,16 +35,11 @@ def get_proceedings_path(meeting,group): return path def get_proceedings_url(meeting,group=None): - if meeting.type_id == 'ietf': - url = "%sproceedings/%s/" % (settings.IETF_HOST_URL,meeting.number) - if group: - url = url + "%s.html" % group.acronym - + url = '%sproceedings/%s/' % (settings.IETF_HOST_URL,meeting.number) + if meeting.type_id == 'ietf' and group: + url = url + '%s.html' % group.acronym elif meeting.type_id == 'interim': - url = "%sproceedings/interim/%s/%s/proceedings.html" % ( - settings.IETF_HOST_URL, - meeting.date.strftime('%Y/%m/%d'), - group.acronym) + url = url + 'proceedings.html' return url def get_session(timeslot, schedule=None):