diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 93f129078..28114e171 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -19,7 +19,7 @@ def show_html_materials(request, meeting_num=None): if now > begin_date: sub_began = 1 # List of WG sessions and Plenary sessions - queryset_list = WgMeetingSession.objects.filter(Q(meeting=meeting_num, group_acronym_id__gte = -3, status_id=4), Q(irtf__isnull=True) | Q(irtf=0)) + queryset_list = WgMeetingSession.objects.filter(Q(meeting=meeting_num, group_acronym_id__gte = -2, status_id=4), Q(irtf__isnull=True) | Q(irtf=0)) queryset_irtf = WgMeetingSession.objects.filter(meeting=meeting_num, group_acronym_id__gte = -2, status_id=4, irtf__gt=0) queryset_interim = [] queryset_training = [] diff --git a/ietf/templates/meeting/list.html b/ietf/templates/meeting/list.html index 8f742cb7d..95a178a23 100644 --- a/ietf/templates/meeting/list.html +++ b/ietf/templates/meeting/list.html @@ -20,11 +20,12 @@ Updated as of {% now "F j, Y, H:i:s (T)" %} - {% for wg in wgs.list|dictsort:"acronym" %} + {% ifequal wgs.grouper "Plenary Sessions" %} + {% for wg in wgs.list|dictsortreversed:"acronym" %} + {% if wg.agenda_file %}[Agenda]{% endif %}{% if wg.minute_file %} [Minutes]{% endif %}
{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} ({{ wg.group_type_str }}) {% endifequal %}
- {% if wg.agenda_file %}[Agenda]{% endif %}{% if wg.minute_file %} [Minutes]{% endif %}
{% include "meeting/submission_status_snippet.html" %} {% for slide in wg.slides %} @@ -37,6 +38,25 @@ Updated as of {% now "F j, Y, H:i:s (T)" %}
{% endfor %} + {% else %} + {% for wg in wgs.list|dictsort:"acronym" %} + + + + + +
{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} ({{ wg.group_type_str }}) {% endifequal %}
+ {% if wg.agenda_file %}[Agenda]{% endif %}{% if wg.minute_file %} [Minutes]{% endif %}
+{% include "meeting/submission_status_snippet.html" %} + {% for slide in wg.slides %} + + + {% endfor %} +
{{ slide.slide_name }}
+
+ + {% endfor %} + {% endifequal %} {% endfor %} {% if training_list %}