Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Respect parent lookup regex value (sending parent viewset to NestedRegistryItem) #87

Closed
wants to merge 2 commits into from
Closed

Respect parent lookup regex value (sending parent viewset to NestedRegistryItem) #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
020b329
Expose the parent viewset to NestedRegisteryItems
May 27, 2015
f4072a3
Respect parent viewset lookup_value_regex in nested routes
May 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions rest_framework_extensions/routers.py
View file
Open in desktop
Expand Up @@ -147,10 +147,11 @@ def get_dynamic_routes_instances(self, viewset, route, dynamic_routes):


class NestedRegistryItem(object):
def __init__(self, router, parent_prefix, parent_item=None):
def __init__(self, router, parent_prefix, parent_item=None, parent_viewset=None):
self.router = router
self.parent_prefix = parent_prefix
self.parent_item = parent_item
self.parent_viewset = parent_viewset

def register(self, prefix, viewset, base_name, parents_query_lookups):
self.router._register(
Expand All @@ -161,7 +162,8 @@ def register(self, prefix, viewset, base_name, parents_query_lookups):
return NestedRegistryItem(
router=self.router,
parent_prefix=prefix,
parent_item=self
parent_item=self,
parent_viewset=viewset
)

def get_prefix(self, current_prefix, parents_query_lookups):
Expand All @@ -174,10 +176,12 @@ def get_parent_prefix(self, parents_query_lookups):
prefix = '/'
current_item = self
i = len(parents_query_lookups) - 1
parent_lookup_value_regex = getattr(self.parent_viewset, 'lookup_value_regex', '[^/.]+')
while current_item:
prefix = '{parent_prefix}/(?P<{parent_pk_kwarg_name}>[^/.]+)/{prefix}'.format(
prefix = '{parent_prefix}/(?P<{parent_pk_kwarg_name}>{parent_lookup_value_regex})/{prefix}'.format(
parent_prefix=current_item.parent_prefix,
parent_pk_kwarg_name=compose_parent_pk_kwarg_name(parents_query_lookups[i]),
parent_lookup_value_regex=parent_lookup_value_regex,
prefix=prefix
)
i -= 1
Expand All @@ -193,7 +197,8 @@ def register(self, *args, **kwargs):
self._register(*args, **kwargs)
return NestedRegistryItem(
router=self,
parent_prefix=self.registry[-1][0]
parent_prefix=self.registry[-1][0],
parent_viewset = self.registry[-1][1]
)

def get_api_root_view(self):
Expand Down