From 8cf309cd6a3bfa1ab71ed40fa1b956dc0267b2c5 Mon Sep 17 00:00:00 2001
From: Tero Kivinen <kivinen@iki.fi>
Date: Sat, 5 Nov 2022 13:54:13 -0400
Subject: [PATCH] fix: Fix upcoming to use Meeting.end_date. (#4701)

---
 ietf/meeting/views.py                | 4 +---
 ietf/templates/meeting/upcoming.html | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index c6d38c802..fa12b645b 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -3466,8 +3466,6 @@ def upcoming(request):
 
     # Get ietf meetings starting 7 days ago, and interim meetings starting today
     ietf_meetings = Meeting.objects.filter(type_id='ietf', date__gte=today-datetime.timedelta(days=7))
-    for m in ietf_meetings:
-        m.end = m.date + datetime.timedelta(days=m.days-1)  # subtract 1 to avoid counting an extra day
 
     interim_sessions = add_event_info_to_session_qs(
         Session.objects.filter(
@@ -3495,7 +3493,7 @@ def upcoming(request):
     for o in entries:
         if isinstance(o, Meeting):
             o.start_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.date, datetime.time.min)).timestamp())
-            o.end_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.end, datetime.time.max)).timestamp())
+            o.end_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.end_date(), datetime.time.max)).timestamp())
         else:
             o.start_timestamp = int(o.official_timeslotassignment().timeslot.utc_start_time().timestamp())
             o.end_timestamp = int(o.official_timeslotassignment().timeslot.utc_end_time().timestamp())
diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index 4fe5faac5..383e3ab42 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -51,9 +51,9 @@
                             {% with meeting=entry %}
                                 <td class="meeting-time"
                                     data-start-date="{{ meeting.date }}"
-                                    data-end-date="{{ meeting.end }}"
+                                    data-end-date="{{ meeting.end_date }}"
                                     data-time-zone="{{ meeting.time_zone }}">
-                                    {{ meeting.date }} to {{ meeting.end }}
+                                    {{ meeting.date }} to {{ meeting.end_date }}
                                 </td>
                                 <td>ietf</td>
                                 <td>
@@ -123,7 +123,7 @@
                           {
                               ietf_meeting_number: '{{ meeting.number }}',
                               start_moment: moment.tz('{{meeting.date}}', '{{ meeting.time_zone }}').startOf('day'),
-                              end_moment: moment.tz('{{meeting.end}}', '{{ meeting.time_zone }}').endOf('day'),
+                              end_moment: moment.tz('{{meeting.end_date}}', '{{ meeting.time_zone }}').endOf('day'),
                               url: '{% url 'agenda' num=meeting.number %}'
                           }{% if not forloop.last %}, {% endif %}
                       {% endwith %}