Skip to content

fix: use UTC for materials/proceedings cutoff checks #4615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jennifer-richards merged 1 commit into from
Oct 20, 2022
Merged

fix: use UTC for materials/proceedings cutoff checks #4615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ietf/meeting/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ def can_manage_materials(self, user):
return can_manage_materials(user,self.group)

def is_material_submission_cutoff(self):
return date_today(self.meeting.tz()) > self.meeting.get_submission_correction_date()
return date_today(datetime.timezone.utc) > self.meeting.get_submission_correction_date()

@rjsparks rjsparks Oct 20, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good find. Makes no sense that this was tied to meeting timezone.

@jennifer-richards jennifer-richards Oct 20, 2022

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks (though I'm probably responsible for tying it there to begin with....)


def joint_with_groups_acronyms(self):
return [group.acronym for group in self.joint_with_groups.all()]
Expand Down
12 changes: 6 additions & 6 deletions ietf/meeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ def materials(request, num=None):
begin_date = meeting.get_submission_start_date()
cut_off_date = meeting.get_submission_cut_off_date()
cor_cut_off_date = meeting.get_submission_correction_date()
now = date_today()
today_utc = date_today(datetime.timezone.utc)
old = timezone.now() - datetime.timedelta(days=1)
if settings.SERVER_MODE != 'production' and '_testoverride' in request.GET:
pass
elif now > cor_cut_off_date:
elif today_utc > cor_cut_off_date:
if meeting.number.isdigit() and int(meeting.number) > 96:
return redirect('ietf.meeting.views.proceedings', num=meeting.number)
else:
Expand All @@ -145,7 +145,7 @@ def materials(request, num=None):
'cor_cut_off_date': cor_cut_off_date
})

past_cutoff_date = date_today() > meeting.get_submission_correction_date()
past_cutoff_date = today_utc > meeting.get_submission_correction_date()

schedule = get_schedule(meeting, None)

Expand Down Expand Up @@ -191,7 +191,7 @@ def materials(request, num=None):
'other': other,
'cut_off_date': cut_off_date,
'cor_cut_off_date': cor_cut_off_date,
'submission_started': now > begin_date,
'submission_started': today_utc > begin_date,
'old': old,
})

Expand Down Expand Up @@ -3620,7 +3620,7 @@ def proceedings(request, num=None):
begin_date = meeting.get_submission_start_date()
cut_off_date = meeting.get_submission_cut_off_date()
cor_cut_off_date = meeting.get_submission_correction_date()
now = date_today()
today_utc = date_today(datetime.timezone.utc)

schedule = get_schedule(meeting, None)
sessions = add_event_info_to_session_qs(
Expand Down Expand Up @@ -3656,7 +3656,7 @@ def proceedings(request, num=None):
'ietf_areas': ietf_areas,
'cut_off_date': cut_off_date,
'cor_cut_off_date': cor_cut_off_date,
'submission_started': now > begin_date,
'submission_started': today_utc > begin_date,
'cache_version': cache_version,
'attendance': meeting.get_attendance(),
'meetinghost_logo': {
Expand Down