diff --git a/changelog b/changelog index 96ff8be7a..36f0ad62f 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,55 @@ +ietfdb (7.5.0) ietf; urgency=medium + + **Django 2.1 upgrade and bugfixes** + + * Merged in [18036] from rjsparks@nostrum.com: + Tweaked the title of the page used to complete reviews. Fixes #2767. + + * Merged in [18037] from rjsparks@nostrum.com: + Removed abandoned charters from any future telechats. Fixes #3003. + + * Separated the session cache from the default cache, using slightly + different settings, in order to not drop sessions when a new release is + deployed. + + * Added a default logger and level for 'django.security' log items, to + route them to our regular syslog. This will give us more information about + failures to retrieve session info, and also things like 404 responses, + which will already be captured in the apache log but with less info. May + need revisiting if it proves to cause excessive logging. + + * Fixed a problem with the code to update a missing person record + association in a meeting registration record. + + * Fixed an issue in a test function that could occasionally fail + incorrectly. + + * Removed the wsgi.py warning about starting without virtualenv; this is + normal under Py3. + + * Fixed a problem with the handling of multiple registrations for the + same person and meeting in api_new_meeting_registration(). + + Django 2.1 transition changes: + + * Changed NullBoleanField() to BooleanField(null=True), according to the + 2.1 upgrade recommendations. + + * Changed the removed django.contrib.auth.views.logout to LogoutView. + + * Adjusted to the changed signature of admin.utils.get_deleted_objects() + + * Adjusted the code to the attribute name change from ._size to .size in + file upload objects. + + * Updated the requirements for Django 2.1 + + * The .render() method of widgets now must accept an additional keyword + argument 'renderer'; adjusted the code accordingly (including a library + patch -- pull request also submitted). + + -- Henrik Levkowetz 24 Jun 2020 20:45:14 +0000 + ietfdb (7.4.0) ietf; urgency=medium **Test suite and OpenID improvements** diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 188100363..aa8c9bcf5 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -957,6 +957,7 @@ def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc="" "group_parents": group_parents, "now": datetime.datetime.now(), "is_current_meeting": bool(num == get_current_ietf_meeting_num()), + "use_codimd": True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False, }, content_type=mimetype[ext]) # If the agenda is for the current meeting, only cache for 2 minutes @@ -1625,6 +1626,7 @@ def session_details(request, num, acronym): 'can_view_request': can_view_request, 'thisweek': datetime.date.today()-datetime.timedelta(days=7), 'now': datetime.datetime.now(), + 'use_codimd': True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False, }) class SessionDraftsForm(forms.Form): @@ -2733,7 +2735,8 @@ def upcoming(request): 'menu_actions': actions, 'menu_entries': menu_entries, 'selected_menu_entry': selected_menu_entry, - 'now': datetime.datetime.now() + 'now': datetime.datetime.now(), + 'use_codimd': True if datetime.date.today()>=settings.MEETING_USES_CODIMD_DATE else False, }) diff --git a/ietf/settings.py b/ietf/settings.py index 394cdd03b..67772250a 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -905,6 +905,8 @@ INTERNET_DRAFT_DAYS_TO_EXPIRE = 185 FLOORPLAN_MEDIA_DIR = 'floor' FLOORPLAN_DIR = os.path.join(MEDIA_ROOT, FLOORPLAN_MEDIA_DIR) +MEETING_USES_CODIMD_DATE = datetime.date(2020,7,6) + # === OpenID Connect Provide Related Settings ================================== # Used by django-oidc-provider diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html index 570c3afa5..9732b1de3 100644 --- a/ietf/templates/meeting/interim_session_buttons.html +++ b/ietf/templates/meeting/interim_session_buttons.html @@ -14,10 +14,18 @@ {% endif %} - {% if item.timeslot.type.slug == 'plenary' %} - + {% if use_codimd %} + {% if item.timeslot.type.slug == 'plenary' %} + + {% else %} + + {% endif %} {% else %} - + {% if item.timeslot.type.slug == 'plenary' %} + + {% else %} + + {% endif %} {% endif %} {# show stream buttons up till end of session, then show archive buttons #} diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html index 8e5389345..aeb1f915f 100644 --- a/ietf/templates/meeting/session_buttons_include.html +++ b/ietf/templates/meeting/session_buttons_include.html @@ -16,10 +16,18 @@ {% endif %} - {% if item.timeslot.type.slug == 'plenary' %} - + {% if use_codimd %} + {% if item.timeslot.type.slug == 'plenary' %} + + {% else %} + + {% endif %} {% else %} - + {% if item.timeslot.type.slug == 'plenary' %} + + {% else %} + + {% endif %} {% endif %} {# show stream buttons up till end of session, then show archive buttons #}