altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Merged in [19300] from jennifer@painless-security.com:

Browse source 
Handle num=None case in proceedings() and specify meeting number in test_proceedings_no_agenda. Fixes #3385.
 - Legacy-Id: 19323
Note: SVN reference [19300] has been migrated to Git commit ca78da6ff4
This commit is contained in:
Robert Sparks 2021-09-03 17:42:12 +00:00
parent 36369f816e ca78da6ff4
commit a6205c3c31
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/meeting/tests_views.py
View file

@ -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'))

2
ietf/meeting/views.py
View file

@ -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()