Fixed a recent regression in agenda.html which caused the 'now' context variable to not be available when checking if a meeting session is in the past or future, to know which recordings or live session links to show. Also fixed a potential timezone issue with regards to this.

- Legacy-Id: 18688

ietf/meeting/admin.py

@@ -97,7 +97,7 @@ class SchedulingEventInline(admin.TabularInline):
 class SessionAdmin(admin.ModelAdmin):
     list_display = ["meeting", "name", "group", "attendees", "requested", "current_status"]
     list_filter = ["meeting", ]
-    raw_id_fields = ["meeting", "group", "materials"]
+    raw_id_fields = ["meeting", "group", "materials", "joint_with_groups", "tombstone_for"]
     search_fields = ["meeting__number", "name", "group__name", "group__acronym", ]
     ordering = ["-id"]
     inlines = [SchedulingEventInline]

ietf/meeting/views.py

@@ -1458,7 +1458,7 @@ def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc=""
         "updated": updated,
         "filter_categories": filter_categories,
         "non_area_keywords": [label.lower() for label in non_area_labels],
-        "now": datetime.datetime.now(),
+        "now": datetime.datetime.now().astimezone(pytz.UTC),
         "is_current_meeting": is_current_meeting,
         "use_codimd": True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False,
         "cache_time": 150 if is_current_meeting else 3600,

ietf/templates/meeting/agenda.html

@@ -65,7 +65,7 @@
   {% endif %}
 
 
-  {% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Customize the agenda view..." only %}
+  {% include "meeting/agenda_filter.html" with filter_categories=filter_categories customize_button_text="Customize the agenda view..." %}
 
         <h2>Download as .ics</h2>
         <p class="buttonlist">
@@ -178,7 +178,7 @@
                       <div class="pull-right padded-left">
                         {% if item.timeslot.type.slug == 'other' %}
                           {% if item.session.agenda or item.session.remote_instructions or item.session.agenda_note %}
-                            {% include "meeting/session_buttons_include.html" with show_agenda=True item=item schedule=schedule only %}
+                            {% include "meeting/session_buttons_include.html" with show_agenda=True item=item schedule=schedule %}
                           {% else %}
                             {% for slide in item.session.slides %}
                               <a href="{{slide.get_href}}">{{ slide.title|clean_whitespace }}</a>

ietf/templates/meeting/session_buttons_include.html

@@ -33,7 +33,7 @@
   {% endif %}
 
   {# show stream buttons up till end of session, then show archive buttons #}
-  {% if now < timeslot.end_time %}
+  {% if now < timeslot.utc_end_time %}
     <!-- Jabber -->
     <a class=""
       href="xmpp:{{session.jabber_room_name}}@jabber.ietf.org?join"