Skip to content
Prev Previous commit
Next Next commit
Change decorator attribute name to url_path per suggestions
  • Loading branch information
tanwanirahul committed Dec 19, 2014
commit 92ebeaa040f75dbc6142355fa25d89b4c990685b
12 changes: 6 additions & 6 deletions rest_framework/routers.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,26 +177,26 @@ def get_routes(self, viewset):
# Dynamic detail routes (@detail_route decorator)
for httpmethods, methodname in detail_routes:
method_kwargs = getattr(viewset, methodname).kwargs
custom_method_name = method_kwargs.pop("custom_method_name", None) or methodname
url_path = method_kwargs.pop("url_path", None) or methodname
initkwargs = route.initkwargs.copy()
initkwargs.update(method_kwargs)
ret.append(Route(
url=replace_methodname(route.url, custom_method_name),
url=replace_methodname(route.url, url_path),
mapping=dict((httpmethod, methodname) for httpmethod in httpmethods),
name=replace_methodname(route.name, custom_method_name),
name=replace_methodname(route.name, url_path),
initkwargs=initkwargs,
))
elif isinstance(route, DynamicListRoute):
# Dynamic list routes (@list_route decorator)
for httpmethods, methodname in list_routes:
method_kwargs = getattr(viewset, methodname).kwargs
custom_method_name = method_kwargs.pop("custom_method_name", None) or methodname
url_path = method_kwargs.pop("url_path", None) or methodname
initkwargs = route.initkwargs.copy()
initkwargs.update(method_kwargs)
ret.append(Route(
url=replace_methodname(route.url, custom_method_name),
url=replace_methodname(route.url, url_path),
mapping=dict((httpmethod, methodname) for httpmethod in httpmethods),
name=replace_methodname(route.name, custom_method_name),
name=replace_methodname(route.name, url_path),
initkwargs=initkwargs,
))
else:
Expand Down