Added another test, and fixed a code flaw it discovered.
- Legacy-Id: 11560
This commit is contained in:
parent
85fb050b2e
commit
58044b103e
ietf/meeting
|
@ -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)
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue