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

Merged in [19055] from rjsparks@nostrum.com:

Browse source 
Redirect to materials page for attempts to see proceedings for meetings that do not yet have schedules. Fixes #3294.
 - Legacy-Id: 19068
Note: SVN reference [19055] has been migrated to Git commit ffd82f1ce8
This commit is contained in:
Robert Sparks 2021-06-02 19:59:18 +00:00
parent 634951c053 ffd82f1ce8
commit f09e90d567
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ietf/meeting/tests_views.py
View file

@ -553,6 +553,15 @@ class MeetingTests(TestCase):
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
def test_proceedings_no_agenda(self):
meeting = MeetingFactory(type_id='ietf',populate_schedule=False,date=datetime.date.today())
url = urlreverse('ietf.meeting.views.proceedings')
r = self.client.get(url)
self.assertRedirects(r, urlreverse('ietf.meeting.views.materials'))
url = urlreverse('ietf.meeting.views.proceedings', kwargs=dict(num=meeting.number))
r = self.client.get(url)
self.assertRedirects(r, urlreverse('ietf.meeting.views.materials', kwargs=dict(num=meeting.number)))
def test_proceedings_acknowledgements(self):
make_meeting_test_data()
meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")

10
ietf/meeting/views.py
View file

@ -3544,8 +3544,14 @@ def proceedings(request, num=None):
meeting = get_meeting(num)
if (meeting.number.isdigit() and int(meeting.number) <= 64) or not meeting.schedule or not meeting.schedule.assignments.exists():
return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num )
if (meeting.number.isdigit() and int(meeting.number) <= 64):
return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num )
if not meeting.schedule or not meeting.schedule.assignments.exists():
kwargs = dict()
if num:
kwargs['num'] = num
return redirect('ietf.meeting.views.materials', **kwargs)
begin_date = meeting.get_submission_start_date()
cut_off_date = meeting.get_submission_cut_off_date()