From 716a77a848c76798417692f220cfb1fac20dcddf Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Wed, 12 Apr 2023 19:34:00 -0300 Subject: [PATCH] fix: Do not try to match None keyword when redirecting to agenda view (#5489) --- ietf/meeting/urls.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index 085347b09..8284f8fcf 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -10,8 +10,7 @@ from ietf.utils.urls import url class AgendaRedirectView(RedirectView): ignore_kwargs = ('owner', 'name') def get_redirect_url(self, *args, **kwargs): - for kwarg in self.ignore_kwargs: - kwargs.pop(kwarg, None) + kwargs = {k: v for k, v in kwargs.items() if v is not None and k not in self.ignore_kwargs} return super().get_redirect_url(*args, **kwargs) safe_for_all_meeting_types = [ @@ -78,10 +77,10 @@ type_ietf_only_patterns_id_optional = [ url(r'^agenda/agenda\.ics$', views.agenda_ical), url(r'^agenda\.ics$', views.agenda_ical), url(r'^agenda.json$', views.agenda_json), - url(r'^agenda/week-view(?:.html)?/?$', RedirectView.as_view(pattern_name='agenda', permanent=True)), + url(r'^agenda/week-view(?:.html)?/?$', AgendaRedirectView.as_view(pattern_name='agenda', permanent=True)), url(r'^floor-plan/?$', views.agenda, name='floor-plan'), url(r'^floor-plan/(?P[-a-z0-9_]+)/?$', RedirectView.as_view(pattern_name='floor-plan', permanent=True)), - url(r'^week-view(?:.html)?/?$', RedirectView.as_view(pattern_name='agenda', permanent=True)), + url(r'^week-view(?:.html)?/?$', AgendaRedirectView.as_view(pattern_name='agenda', permanent=True)), url(r'^materials(?:.html)?/?$', views.materials), url(r'^request_minutes/?$', views.request_minutes), url(r'^materials/%(document)s((?P\.[a-z0-9]+)|/)?$' % settings.URL_REGEXPS, views.materials_document),