altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
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 db0f902145
This commit is contained in:
Henrik Levkowetz 2020-06-27 11:55:12 +00:00
parent 8c90c53463 db0f902145
commit bbb5b9ce3f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/group/urls.py
View file

@ -29,7 +29,7 @@ info_detail_urls = [
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'),

2
ietf/settings.py
View file

@ -626,6 +626,8 @@ GROUP_REVIEW_DAYS_TO_SHOW_IN_REVIEWER_LIST = 365
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]+)",