Changed from get_meetings() to get_meeting() for meeting.views.floor_plan(), in order to raise 404 on missing meetings. Fixes a server 500 on /meeting/floor-plan/ for nonexistant meetings.

 - Legacy-Id: 13999

Author: levkowetz

ietf/meeting/helpers.py

@@ -111,19 +111,14 @@ def get_wg_list(assignments):
     wg_name_list = get_wg_name_list(assignments)
     return Group.objects.filter(acronym__in = set(wg_name_list)).order_by('parent__acronym','acronym')
 
-
-def get_meetings(num=None,type_in=['ietf',]):
+def get_meeting(num=None,type_in=['ietf',]):
     meetings = Meeting.objects
     if type_in:
         meetings = meetings.filter(type__in=type_in)
     if num == None:
         meetings = meetings.order_by("-date")
     else:
         meetings = meetings.filter(number=num)
-    return meetings
-
-def get_meeting(num=None,type_in=['ietf',]):
-    meetings = get_meetings(num,type_in)
     if meetings.exists():
         return meetings.first()
     else:

ietf/meeting/views.py

@@ -46,7 +46,7 @@
 from ietf.meeting.helpers import get_all_assignments_from_schedule
 from ietf.meeting.helpers import get_modified_from_assignments
 from ietf.meeting.helpers import get_wg_list, find_ads_for_meeting
-from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, get_meetings, get_ietf_meeting
+from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, get_ietf_meeting
 from ietf.meeting.helpers import preprocess_assignments_for_agenda, read_agenda_file, read_session_file
 from ietf.meeting.helpers import convert_draft_to_pdf, get_earliest_session_date
 from ietf.meeting.helpers import can_view_interim_request, can_approve_interim_request
@@ -155,7 +155,7 @@ def current_materials(request):
     if meetings:
         return redirect(materials, meetings[0].number)
     else:
-        raise Http404
+        raise Http404('No such meeting')
 
 @cache_page(5 * 60)
 def materials_document(request, document, num=None, ):
@@ -2099,7 +2099,7 @@ def upcoming_ical(request):
 
 
 def floor_plan(request, num=None, floor=None, ):
-    meeting = get_meetings(num).first()
+    meeting = get_meeting(num)
     schedule = meeting.agenda
     floors = FloorPlan.objects.filter(meeting=meeting).order_by('order')
     if floor: