encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-06 13:30:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	rest_framework/routers.py
This commit is contained in:
Artem Homenko 2017-02-06 15:20:53 +02:00
commit e59e2c4cca
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rest_framework/routers.py
View File

@ -96,13 +96,13 @@ class SimpleRouter(BaseRouter):
# Generated using @list_route decorator # Generated using @list_route decorator
# on methods of the viewset. # on methods of the viewset.
DynamicListRoute( DynamicListRoute(
url=r'^{prefix}/{methodname}{trailing_slash}$', url=r'^{prefix}{methodname}{trailing_slash}$',
name='{basename}-{methodnamehyphen}', name='{basename}-{methodnamehyphen}',
initkwargs={} initkwargs={}
), ),
# Detail route. # Detail route.
Route( Route(
url=r'^{prefix}/{lookup}{trailing_slash}$', url=r'^{prefix}{lookup}{trailing_slash}$',
mapping={ mapping={
'get': 'retrieve', 'get': 'retrieve',
'put': 'update', 'put': 'update',
@ -115,7 +115,7 @@ class SimpleRouter(BaseRouter):
# Dynamically generated detail routes. # Dynamically generated detail routes.
# Generated using @detail_route decorator on methods of the viewset. # Generated using @detail_route decorator on methods of the viewset.
DynamicDetailRoute( DynamicDetailRoute(
url=r'^{prefix}/{lookup}/{methodname}{trailing_slash}$', url=r'^{prefix}{lookup}/{methodname}{trailing_slash}$',
name='{basename}-{methodnamehyphen}', name='{basename}-{methodnamehyphen}',
initkwargs={} initkwargs={}
), ),
@ -247,6 +247,9 @@ class SimpleRouter(BaseRouter):
continue continue
# Build the url pattern # Build the url pattern
if prefix:
prefix += "/"
regex = route.url.format( regex = route.url.format(
prefix=prefix, prefix=prefix,
lookup=lookup, lookup=lookup,