From 58044b103e20d15e47dcc563a21923b13638f910 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 8 Jul 2016 11:19:09 +0000 Subject: [PATCH] Added another test, and fixed a code flaw it discovered. - Legacy-Id: 11560 --- ietf/meeting/tests_views.py | 7 ++++++- ietf/meeting/views.py | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index d2eedfbbf..c976f27a4 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -9,6 +9,7 @@ import debug # pyflakes:ignore from django.core.urlresolvers import reverse as urlreverse from django.conf import settings from django.contrib.auth.models import User +from django.utils.text import slugify from pyquery import PyQuery @@ -1104,9 +1105,13 @@ class FloorPlanTests(TestCase): def test_floor_plan_page(self): make_meeting_test_data() meeting = Meeting.objects.filter(type_id='ietf').order_by('id').last() - FloorPlanFactory.create(meeting=meeting) + floorplan = FloorPlanFactory.create(meeting=meeting) url = urlreverse('ietf.meeting.views.floor_plan') r = self.client.get(url) self.assertEqual(r.status_code, 200) + + url = urlreverse('ietf.meeting.views.floor_plan', kwargs={'floor': slugify(floorplan.name)} ) + r = self.client.get(url) + self.assertEqual(r.status_code, 200) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 54c7327cd..34e221226 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -25,6 +25,7 @@ from django.forms.models import modelform_factory, inlineformset_factory from django.forms import ModelForm from django.template.loader import render_to_string from django.utils.functional import curry +from django.utils.text import slugify from django.views.decorators.csrf import ensure_csrf_cookie from ietf.doc.fields import SearchableDocumentsField @@ -1430,7 +1431,7 @@ def floor_plan(request, num=None, floor=None, ): schedule = meeting.agenda floors = FloorPlan.objects.filter(meeting=meeting).order_by('order') if floor: - floors = floors.filter(name=floor) + floors = [ f for f in floors if slugify(f.name) == floor ] return render(request, 'meeting/floor-plan.html', { "schedule": schedule, "number": num,