encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 16:40:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix route iteration in get_urls

Browse Source
This commit is contained in:
Sumanth Ratna 2021-01-01 17:39:54 -05:00
parent 64dcb23852
commit 2096cc97dd
No known key found for this signature in database
GPG Key ID: 310949B7C8B60603
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
rest_framework/routers.py
View File

@ -251,44 +251,42 @@ class SimpleRouter(BaseRouter):
lookup = self.get_lookup_regex(viewset) lookup = self.get_lookup_regex(viewset)
routes = self.get_routes(viewset) routes = self.get_routes(viewset)
is_viewset = isclass(viewset) and issubclass(viewset, ViewSetMixin)
for route in routes: for route in routes:
if isinstance(viewset, View): if is_viewset:
# `viewset` is a Django CBV. REST Frameworks `ViewSet`s
# are included in this if-statement because `ViewSet`s
# subclass `APIView`, which subclasses `View`.
# Only actions which actually exist on the viewset will be bound # Only actions which actually exist on the viewset will be bound
mapping = self.get_method_map(viewset, route.mapping) mapping = self.get_method_map(viewset, route.mapping)
if not mapping: if not mapping:
continue continue
# Build the url pattern
regex = route.url.format(
prefix=prefix,
lookup=lookup,
trailing_slash=self.trailing_slash
)
# If there is no prefix, the first part of the url is probably
# controlled by project's urls.py and the router is in an app,
# so a slash in the beginning will (A) cause Django to give
# warnings and (B) generate URLS that will require using '//'.
if not prefix and regex[:2] == '^/':
regex = '^' + regex[2:]
initkwargs = route.initkwargs.copy()
initkwargs.update({
'basename': basename,
'detail': route.detail,
})
view = viewset.as_view(mapping, **initkwargs) view = viewset.as_view(mapping, **initkwargs)
name = route.name.format(basename=basename)
django_path = re_path(regex, view, name=name)
else: else:
# assume that `viewset` is a Django view # assume that `viewset` is a Django view
view = viewset django_path = path(prefix, viewset, name=prefix)
# Build the url pattern
regex = route.url.format(
prefix=prefix,
lookup=lookup,
trailing_slash=self.trailing_slash
)
# If there is no prefix, the first part of the url is probably
# controlled by project's urls.py and the router is in an app,
# so a slash in the beginning will (A) cause Django to give
# warnings and (B) generate URLS that will require using '//'.
if not prefix and regex[:2] == '^/':
regex = '^' + regex[2:]
initkwargs = route.initkwargs.copy()
initkwargs.update({
'basename': basename,
'detail': route.detail,
})
name = route.name.format(basename=basename)
django_path = re_path(regex, view, name=name)
ret.append(django_path) ret.append(django_path)