From db0f9021450f0d44d93cdd9348f720fb55541b9f Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 25 Jun 2020 20:41:49 +0000 Subject: [PATCH] Change group edit field url regexp to accept the field names (specifically role names) we use by allowing hyphens. Commit ready to merge. - Legacy-Id: 18064 --- ietf/group/urls.py | 2 +- ietf/settings.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ietf/group/urls.py b/ietf/group/urls.py index 4e563d9c6..47b44d2c1 100644 --- a/ietf/group/urls.py +++ b/ietf/group/urls.py @@ -29,7 +29,7 @@ info_detail_urls = [ url(r'^deps/(?P[\w-]+)/$', views.dependencies), url(r'^meetings/$', views.meetings), url(r'^edit/$', views.edit, {'action': "edit"}), - url(r'^edit/(?P\w+)/?$', views.edit, {'action': "edit"}), + url(r'^edit/%(group_edit_field)s/?$'%settings.URL_REGEXPS, views.edit, {'action': "edit"}), url(r'^conclude/$', views.conclude), url(r'^milestones/$', milestone_views.edit_milestones, {'milestone_set': "current"}, name='ietf.group.milestones.edit_milestones;current'), url(r'^milestones/charter/$', milestone_views.edit_milestones, {'milestone_set': "charter"}, name='ietf.group.milestones.edit_milestones;charter'), diff --git a/ietf/settings.py b/ietf/settings.py index c16319491..ef9151d2a 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -630,6 +630,7 @@ URL_REGEXPS = { "rev": r"(?P[0-9]{1,2}(-[0-9]{2})?)", "owner": r"(?P[-A-Za-z0-9\'+._]+@[A-Za-z0-9-._]+)", "schedule_name": r"(?P[A-Za-z0-9-:_]+)", + "group_edit_field": r"(?P[\w-]+)", } # Override this in settings_local.py if needed