From ca78da6ff486a7c12305e540d324cb7493bc8287 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 20 Aug 2021 16:16:00 +0000 Subject: [PATCH] Handle num=None case in proceedings() and specify meeting number in test_proceedings_no_agenda. Fixes #3385. Commit ready for merge. - Legacy-Id: 19300 --- ietf/meeting/tests_views.py | 3 ++- ietf/meeting/views.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 4170f0967..ee61b95f4 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -615,7 +615,8 @@ class MeetingTests(TestCase): self.assertEqual(r.status_code, 200) def test_proceedings_no_agenda(self): - meeting = MeetingFactory(type_id='ietf',populate_schedule=False,date=datetime.date.today()) + # Meeting number must be larger than the last special-cased proceedings (currently 96) + meeting = MeetingFactory(type_id='ietf',populate_schedule=False,date=datetime.date.today(), number='100') url = urlreverse('ietf.meeting.views.proceedings') r = self.client.get(url) self.assertRedirects(r, urlreverse('ietf.meeting.views.materials')) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index d1d69d136..6f822e93f 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -3791,7 +3791,7 @@ def proceedings(request, num=None): meeting = get_meeting(num) if (meeting.number.isdigit() and int(meeting.number) <= 96): - return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num ) + return HttpResponseRedirect('https://www.ietf.org/proceedings/%s' % meeting.number) if not meeting.schedule or not meeting.schedule.assignments.exists(): kwargs = dict()