Skip to content

Commit 000e843

Browse files
Merge pull request ietf-tools#4615 from painless-security/jennifer/materials-tz
fix: use UTC for materials/proceedings cutoff checks
2 parents dcc4269 + fb644d7 commit 000e843

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

ietf/meeting/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ def can_manage_materials(self, user):
11601160
return can_manage_materials(user,self.group)
11611161

11621162
def is_material_submission_cutoff(self):
1163-
return date_today(self.meeting.tz()) > self.meeting.get_submission_correction_date()
1163+
return date_today(datetime.timezone.utc) > self.meeting.get_submission_correction_date()
11641164

11651165
def joint_with_groups_acronyms(self):
11661166
return [group.acronym for group in self.joint_with_groups.all()]

ietf/meeting/views.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ def materials(request, num=None):
129129
begin_date = meeting.get_submission_start_date()
130130
cut_off_date = meeting.get_submission_cut_off_date()
131131
cor_cut_off_date = meeting.get_submission_correction_date()
132-
now = date_today()
132+
today_utc = date_today(datetime.timezone.utc)
133133
old = timezone.now() - datetime.timedelta(days=1)
134134
if settings.SERVER_MODE != 'production' and '_testoverride' in request.GET:
135135
pass
136-
elif now > cor_cut_off_date:
136+
elif today_utc > cor_cut_off_date:
137137
if meeting.number.isdigit() and int(meeting.number) > 96:
138138
return redirect('ietf.meeting.views.proceedings', num=meeting.number)
139139
else:
@@ -145,7 +145,7 @@ def materials(request, num=None):
145145
'cor_cut_off_date': cor_cut_off_date
146146
})
147147

148-
past_cutoff_date = date_today() > meeting.get_submission_correction_date()
148+
past_cutoff_date = today_utc > meeting.get_submission_correction_date()
149149

150150
schedule = get_schedule(meeting, None)
151151

@@ -191,7 +191,7 @@ def materials(request, num=None):
191191
'other': other,
192192
'cut_off_date': cut_off_date,
193193
'cor_cut_off_date': cor_cut_off_date,
194-
'submission_started': now > begin_date,
194+
'submission_started': today_utc > begin_date,
195195
'old': old,
196196
})
197197

@@ -3620,7 +3620,7 @@ def proceedings(request, num=None):
36203620
begin_date = meeting.get_submission_start_date()
36213621
cut_off_date = meeting.get_submission_cut_off_date()
36223622
cor_cut_off_date = meeting.get_submission_correction_date()
3623-
now = date_today()
3623+
today_utc = date_today(datetime.timezone.utc)
36243624

36253625
schedule = get_schedule(meeting, None)
36263626
sessions = add_event_info_to_session_qs(
@@ -3656,7 +3656,7 @@ def proceedings(request, num=None):
36563656
'ietf_areas': ietf_areas,
36573657
'cut_off_date': cut_off_date,
36583658
'cor_cut_off_date': cor_cut_off_date,
3659-
'submission_started': now > begin_date,
3659+
'submission_started': today_utc > begin_date,
36603660
'cache_version': cache_version,
36613661
'attendance': meeting.get_attendance(),
36623662
'meetinghost_logo': {

0 commit comments

Comments
 (0)