Skip to content

Commit

Permalink
Handle num=None case in proceedings() and specify meeting number in t…
Browse files Browse the repository at this point in the history
…est_proceedings_no_agenda. Fixes #3385. Commit ready for merge.

 - Legacy-Id: 19300
  • Loading branch information
jennifer-richards committed Aug 20, 2021
1 parent b88a695 commit ca78da6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ietf/meeting/tests_views.py
Expand Up @@ -615,7 +615,8 @@ def test_proceedings(self):
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'))
Expand Down
2 changes: 1 addition & 1 deletion ietf/meeting/views.py
Expand Up @@ -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()
Expand Down

0 comments on commit ca78da6

Please sign in to comment.