Skip to content

Commit 4b05b7b

Browse files
committed
Fixed some issues with agenda and proceedings code for meetings numbered 64 and below, actualized by the introduction of meeting records for such meetings.
- Legacy-Id: 14918
1 parent a7a195a commit 4b05b7b

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

ietf/meeting/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc=""
449449
assert num is None or num.isdigit()
450450

451451
meeting = get_ietf_meeting(num)
452-
if not meeting or (meeting.number.isdigit() and int(meeting.number) <= 64 and not meeting.agenda.assignments.exists()):
453-
if ext == '.html':
452+
if not meeting or (meeting.number.isdigit() and int(meeting.number) <= 64 and (not meeting.agenda or not meeting.agenda.assignments.exists())):
453+
if ext == '.html' or (meeting and meeting.number.isdigit() and 0 < int(meeting.number) <= 64):
454454
return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num )
455455
else:
456456
raise Http404("No such meeting")
@@ -2064,7 +2064,7 @@ def proceedings(request, num=None):
20642064

20652065
meeting = get_meeting(num)
20662066

2067-
if meeting.number <= 64 or not meeting.agenda.assignments.exists():
2067+
if meeting.number <= 64 or not meeting.agenda or not meeting.agenda.assignments.exists():
20682068
return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num )
20692069

20702070
begin_date = meeting.get_submission_start_date()
@@ -2095,7 +2095,7 @@ def finalize_proceedings(request, num=None):
20952095

20962096
meeting = get_meeting(num)
20972097

2098-
if meeting.number <= 64 or not meeting.agenda.assignments.exists() or meeting.proceedings_final:
2098+
if meeting.number <= 64 or not meeting.agenda or not meeting.agenda.assignments.exists() or meeting.proceedings_final:
20992099
raise Http404
21002100

21012101
if request.method=='POST':

0 commit comments

Comments
 (0)