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

Merge 6e18ed7dc8 into ecb37f518e

Browse Source
This commit is contained in:
Andriy Syrovenko 2015-04-17 18:14:24 +00:00
commit 5aa7bef0ab
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rest_framework/routers.py
View File

@ -166,20 +166,22 @@ class SimpleRouter(BaseRouter):
list_routes.append((httpmethods, methodname))
def _get_dynamic_routes(route, dynamic_routes):
ret = []
routes_map = OrderedDict()
for httpmethods, methodname in dynamic_routes:
method_kwargs = getattr(viewset, methodname).kwargs
initkwargs = route.initkwargs.copy()
initkwargs.update(method_kwargs)
url_path = initkwargs.pop("url_path", None) or methodname
ret.append(Route(
url=replace_methodname(route.url, url_path),
mapping=dict((httpmethod, methodname) for httpmethod in httpmethods),
name=replace_methodname(route.name, url_path),
initkwargs=initkwargs,
))
url = replace_methodname(route.url, url_path)
if url not in routes_map:
routes_map[url] = {
'mapping': {},
'name': replace_methodname(route.name, url_path),
'initkwargs': initkwargs
}
routes_map[url]['mapping'].update(dict((httpmethod, methodname) for httpmethod in httpmethods))
return ret
return list(Route(url=url, **args) for url, args in routes_map.items())
ret = []
for route in self.routes: