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

Fix issues with routers for custom list-route and detail-routes (#4229)

Browse Source
This commit is contained in:
Vikalp Jain 2016-06-29 21:57:17 +05:30 committed by Tom Christie
parent d41ddc9e5f
commit 1d2fba906e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/routers.py
View File

@ -144,7 +144,9 @@ class SimpleRouter(BaseRouter):
Returns a list of the Route namedtuple. Returns a list of the Route namedtuple.
""" """
known_actions = flatten([route.mapping.values() for route in self.routes if isinstance(route, Route)]) # converting to list as iterables are good for one pass, known host needs to be checked again and again for
# different functions.
known_actions = list(flatten([route.mapping.values() for route in self.routes if isinstance(route, Route)]))
# Determine any `@detail_route` or `@list_route` decorated methods on the viewset # Determine any `@detail_route` or `@list_route` decorated methods on the viewset
detail_routes = [] detail_routes = []
@ -154,6 +156,7 @@ class SimpleRouter(BaseRouter):
httpmethods = getattr(attr, 'bind_to_methods', None) httpmethods = getattr(attr, 'bind_to_methods', None)
detail = getattr(attr, 'detail', True) detail = getattr(attr, 'detail', True)
if httpmethods: if httpmethods:
# checking method names against the known actions list
if methodname in known_actions: if methodname in known_actions:
raise ImproperlyConfigured('Cannot use @detail_route or @list_route ' raise ImproperlyConfigured('Cannot use @detail_route or @list_route '
'decorators on method "%s" ' 'decorators on method "%s" '