Merge remote-tracking branch 'ietf-tools/main' into feat/rfc

ietf/meeting/models.py

@@ -1254,7 +1254,8 @@ class Session(models.Model):
         return Constraint.objects.filter(target=self.group, meeting=self.meeting).order_by('name__name')
 
     def official_timeslotassignment(self):
-        if not hasattr(self, "_cache_official_timeslotassignment"):
+        # cache only non-None values
+        if getattr(self, "_cache_official_timeslotassignment", None) is None:
             self._cache_official_timeslotassignment = self.timeslotassignments.filter(schedule__in=[self.meeting.schedule, self.meeting.schedule.base if self.meeting.schedule else None]).first()
         return self._cache_official_timeslotassignment
 

ietf/settings.py

@@ -1295,6 +1295,6 @@ if SERVER_MODE != 'production':
     # Cannot have this set to True if we're using http: from the dev-server:
     CSRF_COOKIE_SECURE = False
     CSRF_COOKIE_SAMESITE = 'Lax'
-    CSRF_TRUSTED_ORIGINS = ['http://localhost:8000']
+    CSRF_TRUSTED_ORIGINS += ['http://localhost:8000']
     SESSION_COOKIE_SECURE = False
     SESSION_COOKIE_SAMESITE = 'Lax'

ietf/static/js/list.js

@@ -273,14 +273,20 @@ $(document)
                 $(table)[0]
                     .dispatchEvent(new Event("tablesorter:done"));
 
-                // if there is a data-default-sort attribute on a column, pre-sort the table on that
-                const presort_col = $(header_row).children("[data-default-sort]:first");
-                if (presort_col) {
-                    const order = presort_col.attr("data-default-sort");
-                    if (order == "asc" || order == "desc") {
-                        $.each(list_instance, (i, e) => {
-                            e.sort(presort_col.attr("data-sort"), { order: order, sortFunction: text_sort });
-                        });
+                // check if there is a sort query argument, and leave the table alone if so
+                const params = new Proxy(new URLSearchParams(window.location.search), {
+                    get: (searchParams, prop) => searchParams.get(prop),
+                });
+                if (!params.sort) {
+                    // else, if there is a data-default-sort attribute on a column, pre-sort the table on that
+                    const presort_col = $(header_row).children("[data-default-sort]:first");
+                    if (presort_col) {
+                        const order = presort_col.attr("data-default-sort");
+                        if (order === "asc" || order === "desc") {
+                            $.each(list_instance, (i, e) => {
+                                e.sort(presort_col.attr("data-sort"), { order: order, sortFunction: text_sort });
+                            });
+                        }
                     }
                 }
             });

ietf/templates/liaisons/liaison_desc.html

@@ -1,4 +1,6 @@
 <div class="alert alert-info">
     Additional information about IETF liaison relationships is available on the
+    <a href="https://www.ietf.org/about/liaisons/" target="_blank">IETF webpage</a>
+    and the
     <a href="https://www.iab.org/liaisons/" target="_blank">Internet Architecture Board liaison webpage</a>.
 </div>

ietf/templates/meeting/proceedings_attendees.html

@@ -1,6 +1,9 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin markup_tags %}
+{% load origin markup_tags static %}
+{% block pagehead %}
+    <link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
+{% endblock %}
 {% block title %}IETF {{ meeting.number }} proceedings{% endblock %}
 {% block content %}
     {% origin %}
@@ -12,4 +15,7 @@
     </h1>
     <h2>Attendee list of IETF {{ meeting.number }} meeting</h2>
     {{ template|safe }}
+{% endblock %}
+{% block js %}
+    <script src="{% static "ietf/js/list.js" %}"></script>
 {% endblock %}

ietf/templates/registration/edit_profile.html

@@ -76,7 +76,7 @@
                     <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc8713' %}">RFC 8713</a>
                     for eligibility requirements.
                     For the 2021 and 2022 NomComs, see also
-                    <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc8989' %}">RFC 8989</a>.
+                    <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc9389' %}">RFC 9389</a>.
                 </p>
             {% endif %}
         </div>