Skip to content

Commit dcb6da9

Browse files
fix: use tz-aware meeting datetime to decide when to show ical link (ietf-tools#4429)
* refactor: reimplement Meeting.end_datetime() using datetime_from_date helper * fix: use tz-aware meeting datetime to decide when to show ical link
1 parent 4084d7d commit dcb6da9

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

ietf/meeting/models.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,14 @@ def get_meeting_date (self,offset):
138138
def end_date(self):
139139
return self.get_meeting_date(self.days-1)
140140

141+
def start_datetime(self):
142+
"""Start-of-day on meeting.date in meeting time zone"""
143+
return datetime_from_date(self.date, self.tz())
144+
141145
def end_datetime(self):
142-
"""Datetime of the first instant _after_ the meeting's last day"""
143-
return self.tz().localize(
144-
datetime.datetime.combine(self.get_meeting_date(self.days), datetime.time())
145-
)
146+
"""Datetime of the first instant _after_ the meeting's last day in meeting time zone"""
147+
return datetime_from_date(self.get_meeting_date(self.days), self.tz())
148+
146149
def get_00_cutoff(self):
147150
start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day, tzinfo=pytz.utc)
148151
importantdate = self.importantdate_set.filter(name_id='idcutoff').first()

ietf/templates/meeting/session_details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h1>
1414
<br>
1515
<small class="text-muted">{{ acronym }}</small>
1616
</h1>
17-
{% if meeting.date >= thisweek %}
17+
{% if meeting.start_datetime >= thisweek %}
1818
<a class="regular float-end"
1919
title="icalendar entry for {{ acronym }}@{{ meeting.number }}"
2020
aria-label="icalendar entry for {{ acronym }}@{{ meeting.number }}"

0 commit comments

Comments
 (0)