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 URLs

Browse Source
This commit is contained in:
Sumanth Ratna 2020-12-31 11:18:59 -05:00
parent bb21461037
commit 0dad5f15bf
No known key found for this signature in database
GPG Key ID: 310949B7C8B60603
1 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
rest_framework/routers.py
View File

@ -17,7 +17,7 @@ import itertools
from collections import OrderedDict, namedtuple from collections import OrderedDict, namedtuple
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.urls import NoReverseMatch, re_path from django.urls import NoReverseMatch, re_path, path
from django.views.generic.base import View from django.views.generic.base import View
from rest_framework import views from rest_framework import views
@ -148,10 +148,15 @@ class SimpleRouter(BaseRouter):
Returns a list of the Route namedtuple. Returns a list of the Route namedtuple.
""" """
if not isinstance(viewset, ViewSet):
# `viewset` is not a REST Framework ViewSet,
# so we can't dynamically generate any routes
return [viewset, ]
# converting to list as iterables are good for one pass, known host needs to be checked again and again for # converting to list as iterables are good for one pass, known host needs to be checked again and again for
# different functions. # different functions.
known_actions = list(flatten([route.mapping.values() for route in self.routes if isinstance(route, Route)])) known_actions = list(flatten([route.mapping.values() for route in self.routes if isinstance(route, Route)]))
extra_actions = viewset.get_extra_actions() if isinstance(viewset, ViewSet) else [] extra_actions = viewset.get_extra_actions()
# checking action names against the known actions list # checking action names against the known actions list
not_allowed = [ not_allowed = [
@ -239,40 +244,47 @@ class SimpleRouter(BaseRouter):
for route in routes: for route in routes:
# Only actions which actually exist on the viewset will be bound if isinstance(viewset, View):
mapping = self.get_method_map(viewset, route.mapping) # `viewset` is a Django CBV. REST Frameworks `ViewSet`s
if not mapping: # are included in this if-statement because `ViewSet`s
continue # subclass `APIView`, which subclasses `View`.
# 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,
})
if isinstance(viewset, ViewSet) or isinstance(viewset, View):
# `viewset` is either a REST Framework `ViewSet`
# or a Django class-based view.
view = viewset.as_view(mapping, **initkwargs) view = viewset.as_view(mapping, **initkwargs)
else: else:
# assume that `viewset` is a Django view function # assume that `viewset` is a Django view function
view = viewset view = viewset
name = route.name.format(basename=basename)
ret.append(re_path(regex, view, name=name)) if isinstance(route, Route):
# Only actions which actually exist on the viewset will be bound
mapping = self.get_method_map(viewset, route.mapping)
if not mapping:
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,
})
name = route.name.format(basename=basename)
django_path = re_path(regex, view, name=name)
else:
django_path = path(prefix, view, name=basename)
ret.append(django_path)
return ret return ret