diff --git a/ietf/secr/proceedings/urls.py b/ietf/secr/proceedings/urls.py index 5212795c4..f7fdd2db2 100644 --- a/ietf/secr/proceedings/urls.py +++ b/ietf/secr/proceedings/urls.py @@ -28,7 +28,4 @@ urlpatterns = patterns('ietf.secr.proceedings.views', url(r'^interim/(?Pinterim-\d{4}-[A-Za-z0-9_\-\+]+)/delete/$', 'delete_interim_meeting', name='proceedings_delete_interim_meeting'), url(r'^interim/(?P[A-Za-z0-9_\-\+]+)/$', 'interim', name='proceedings_interim'), - #url(r'^interim/directory/$', 'interim_directory', name='proceedings_interim_directory'), - #url(r'^interim/directory/(?P(group|date))/$', 'interim_directory', - # name='proceedings_interim_directory_sort'), ) diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index 4677efc3d..b05753904 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -32,9 +32,6 @@ from ietf.secr.proceedings.proc_utils import ( gen_acknowledgement, gen_agenda, gen_progress, gen_research, gen_training, create_proceedings, create_interim_directory, create_recording ) -from ietf.secr.proceedings.models import InterimMeeting # proxy model - - # ------------------------------------------------- # Globals # ------------------------------------------------- @@ -461,17 +458,6 @@ def interim(request, acronym): RequestContext(request, {}), ) -@role_required(*AUTHORIZED_ROLES) -def interim_directory(request, sortby=None): - if sortby == 'group': - qs = InterimMeeting.objects.all() - meetings = sorted(qs, key=lambda a: a.group.acronym) - else: - meetings = InterimMeeting.objects.all().order_by('-date') - - return render_to_response('proceedings/interim_directory.html', { - 'meetings': meetings}, -) @role_required(*AUTHORIZED_ROLES) def main(request): diff --git a/ietf/secr/templates/proceedings/interim_directory.html b/ietf/secr/templates/proceedings/interim_directory.html index 28de209a6..d0aeaea76 100644 --- a/ietf/secr/templates/proceedings/interim_directory.html +++ b/ietf/secr/templates/proceedings/interim_directory.html @@ -13,7 +13,7 @@ {% for meeting in meetings %} {{ meeting.date }} - {{ meeting.group.acronym }} + {{ meeting.group.acronym }} {% if meeting.agenda %} Agenda {% else %}