Changed the logic for what is the 'current' ietf meeting to disregard whether there's an agenda for the meeting or not. This lets people see the correct session request page for the current meeting. However, it also makes the /meeting/agenda.html page fail because there's no schedule associated with the meeting; so alternative pages saying 'No agenda available' has been added, too.

- Legacy-Id: 7641

ietf/meeting/helpers.py

@@ -106,7 +106,7 @@ def get_wg_list(scheduledsessions):
 
 def get_meeting(num=None):
     if num == None:
-        meeting = Meeting.objects.filter(type="ietf").exclude(agenda=None).order_by("-date")[:1].get()
+        meeting = Meeting.objects.filter(type="ietf").order_by("-date")[:1].get()
     else:
         meeting = get_object_or_404(Meeting, number=num)
     return meeting

ietf/meeting/views.py

@@ -347,6 +347,10 @@ def agenda(request, num=None, name=None, base=None, ext=None):
     mimetype = {".html":"text/html", ".txt": "text/plain", ".ics":"text/calendar", ".csv":"text/csv"}
     meeting = get_meeting(num)
     schedule = get_schedule(meeting, name)
+    if schedule == None:
+        return HttpResponse(render_to_string("meeting/no-"+base+ext,
+            {'meeting':meeting }, RequestContext(request)), content_type=mimetype[ext])
+
     updated = meeting_updated(meeting)
     return HttpResponse(render_to_string("meeting/"+base+ext,
         {"schedule":schedule, "updated": updated}, RequestContext(request)), content_type=mimetype[ext])
@@ -547,6 +551,9 @@ def ical_agenda(request, num=None, name=None, ext=None):
     schedule = get_schedule(meeting, name)
     updated = meeting_updated(meeting)
 
+    if schedule is None:
+        raise Http404
+
     q = request.META.get('QUERY_STRING','') or ""
     filter = set(urllib.unquote(q).lower().split(','))
     include = [ i for i in filter if not (i.startswith('-') or i.startswith('~')) ]

ietf/templates/meeting/no-agenda-utc.html

@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% load ietf_filters %}
+{# Copyright The IETF Trust 2007, All Rights Reserved #}
+{% load humanize %}
+{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
+
+{% block content %}
+<h1>IETF {{ meeting.number }} Meeting Agenda</h1>
+
+<p>{{ meeting.city }}, {{ meeting.date|date:"F j" }} &#8211; {% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}{{ meeting.end_date|date:"j, Y" }}<br />
+</p>
+
+<h1>There is no Agenda available yet.</h1>
+
+{% endblock %}

ietf/templates/meeting/no-agenda.csv

@@ -0,0 +1,2 @@
+{% load humanize %}{% autoescape off %}{% load ietf_filters %}"Date","Start","End","Session","Room","Area","Acronym","Type","Description","Session ID","Agenda","Slides"
+{% endautoescape %}

ietf/templates/meeting/no-agenda.html

@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% load ietf_filters %}
+{# Copyright The IETF Trust 2007, All Rights Reserved #}
+{% load humanize %}
+{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
+
+{% block content %}
+<h1>IETF {{ meeting.number }} Meeting Agenda</h1>
+
+<p>{{ meeting.city }}, {{ meeting.date|date:"F j" }} &#8211; {% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}{{ meeting.end_date|date:"j, Y" }}<br />
+</p>
+
+<h1>There is no Agenda available yet.</h1>
+
+{% endblock %}

ietf/templates/meeting/no-agenda.txt

@@ -0,0 +1,15 @@
+{% load humanize %}{% load ietf_filters %}{% autoescape off %}
+
+{% filter center:72 %} Agenda of the {{ meeting.number|ordinal }} IETF Meeting {% endfilter %}
+{% if meeting.agenda_note %}
+{% filter center:72 %}{{ meeting.agenda_note|striptags|wrap_text:72|safe }}{% endfilter %}
+{% endif %}
+{% filter center:72 %}{{ meeting.date|date:"F j" }}-{% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}{{ meeting.end_date|date:"j, Y" }}{% endfilter %}
+
+{% filter center:72 %}IETF agendas are subject to change, up to and during the meeting.{% endfilter %}
+
+
+{% filter center:72 %}There is no Agenda available yet.{% endfilter %}
+
+
+{% endautoescape %}