Merged in [9005] from rcross@amsl.com:
Fixed the group link on the standalone Interim Meeting Proceedings
directory page.
Also removed some dead code.
- Legacy-Id: 9015
Note: SVN reference [9005] has been migrated to Git commit 9fed6d8774
This commit is contained in:
commit
ff3603b979
|
@ -28,7 +28,4 @@ urlpatterns = patterns('ietf.secr.proceedings.views',
|
|||
url(r'^interim/(?P<meeting_num>interim-\d{4}-[A-Za-z0-9_\-\+]+)/delete/$', 'delete_interim_meeting',
|
||||
name='proceedings_delete_interim_meeting'),
|
||||
url(r'^interim/(?P<acronym>[A-Za-z0-9_\-\+]+)/$', 'interim', name='proceedings_interim'),
|
||||
#url(r'^interim/directory/$', 'interim_directory', name='proceedings_interim_directory'),
|
||||
#url(r'^interim/directory/(?P<sortby>(group|date))/$', 'interim_directory',
|
||||
# name='proceedings_interim_directory_sort'),
|
||||
)
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
{% for meeting in meetings %}
|
||||
<tr class="{% cycle row1,row2 %}">
|
||||
<td align="left" style="white-space: nowrap">{{ meeting.date }}</td>
|
||||
<td><a href="/wg/{{ meeting.group.acronym }}">{{ meeting.group.acronym }}</a></td>
|
||||
<td><a href="http://datatracker.ietf.org/wg/{{ meeting.group.acronym }}">{{ meeting.group.acronym }}</a></td>
|
||||
{% if meeting.agenda %}
|
||||
<td width="70" align="center"><a href="{{ meeting.agenda.get_absolute_url }}">Agenda</a></td>
|
||||
{% else %}
|
||||
|
|
Loading…
Reference in a new issue