Merged in [18064] from rjsparks@nostrum.com:

    Change group edit field url regexp to accept the field names (specifically role names) we use by allowing hyphens.
 - Legacy-Id: 18072
Note: SVN reference [18064] has been migrated to Git commit db0f902

Author: levkowetz

ietf/group/urls.py

@@ -29,7 +29,7 @@
     url(r'^deps/(?P<output_type>[\w-]+)/$', views.dependencies),
     url(r'^meetings/$', views.meetings),
     url(r'^edit/$', views.edit, {'action': "edit"}),
-    url(r'^edit/(?P<field>\w+)/?$', views.edit, {'action': "edit"}),
+    url(r'^edit/(?P<field>[-a-z0-9_]+)/?$', 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'),

ietf/settings.py

@@ -626,6 +626,8 @@ def skip_unreadable_post(record):
 DATE_FORMAT = "Y-m-d"
 DATETIME_FORMAT = "Y-m-d H:i T"
 
+# Add reusable URL regexps here, for consistency.  No need to do so if the
+# regex can reasonably be expected to be a unique one-off.
 URL_REGEXPS = {
     "acronym": r"(?P<acronym>[-a-z0-9]+)",
     "charter": r"(?P<name>charter-[-a-z0-9]+)",