Skip to content

D
django
Kaydet (Commit) 269a5dbd authored tarafından Marcus Pennington's avatar Marcus Pennington
Dosyalara gözat
Seçenekler

Fixed #24700 -- Added dash to slug regex in http docs

üst 8efea1b8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
docs/topics/http/urls.txt
Dosyayı görüntüle @ 269a5dbd
...@@ -320,10 +320,10 @@ prefix is used repeatedly. For example, consider this URLconf:: ...@@ -320,10 +320,10 @@ prefix is used repeatedly. For example, consider this URLconf::
from . import views from . import views
urlpatterns = [ urlpatterns = [
url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/history/$', views.history), url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/history/$', views.history),
url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/edit/$', views.edit), url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/edit/$', views.edit),
url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/discuss/$', views.discuss), url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/discuss/$', views.discuss),
url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/permissions/$', views.permissions), url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/permissions/$', views.permissions),
] ]
We can improve this by stating the common path prefix only once and grouping We can improve this by stating the common path prefix only once and grouping
...@@ -333,7 +333,7 @@ the suffixes that differ:: ...@@ -333,7 +333,7 @@ the suffixes that differ::
from . import views from . import views
urlpatterns = [ urlpatterns = [
url(r'^(?P<page_slug>\w+)-(?P<page_id>\w+)/', include([ url(r'^(?P<page_slug>[\w-]+)-(?P<page_id>\w+)/', include([
url(r'^history/$', views.history), url(r'^history/$', views.history),
url(r'^edit/$', views.edit), url(r'^edit/$', views.edit),
url(r'^discuss/$', views.discuss), url(r'^discuss/$', views.discuss),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment