Commit 6673ef2

authored

Merge pull request #145 from StyXman/master

Possible fix for #144.

2 parents 20d7c37 + 1b4e177 commit 6673ef2Copy full SHA for 6673ef2

File tree

-9

lines changed

-9

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ def __init__(self, drf_router=None):`
`21`	`21`	`else:`
`22`	`22`	`self.get_all_view_names(root_urlconf.urlpatterns)`
`23`	`23`
`24`		`- def get_all_view_names(self, urlpatterns, parent_pattern=None):`
	`24`	`+ def get_all_view_names(self, urlpatterns, parent_regex=''):`
`25`	`25`	`for pattern in urlpatterns:`
`26`	`26`	`if isinstance(pattern, RegexURLResolver):`
`27`		`- parent_pattern = None if pattern._regex == "^" else pattern`
`28`		`- self.get_all_view_names(urlpatterns=pattern.url_patterns, parent_pattern=parent_pattern)`
	`27`	`+ regex = '' if pattern._regex == "^" else pattern._regex`
	`28`	`+ self.get_all_view_names(urlpatterns=pattern.url_patterns, parent_regex=parent_regex+regex)`
`29`	`29`	`elif isinstance(pattern, RegexURLPattern) and self._is_drf_view(pattern) and not self._is_format_endpoint(pattern):`
`30`		`- api_endpoint = ApiEndpoint(pattern, parent_pattern, self.drf_router)`
	`30`	`+ api_endpoint = ApiEndpoint(pattern, parent_regex, self.drf_router)`
`31`	`31`	`self.endpoints.append(api_endpoint)`
`32`	`32`
`33`	`33`	`def _is_drf_view(self, pattern):`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@`
`7`	`7`
`8`	`8`	`class ApiEndpoint(object):`
`9`	`9`
`10`		`- def __init__(self, pattern, parent_pattern=None, drf_router=None):`
	`10`	`+ def __init__(self, pattern, parent_regex=None, drf_router=None):`
`11`	`11`	`self.drf_router = drf_router`
`12`	`12`	`self.pattern = pattern`
`13`	`13`	`self.callback = pattern.callback`
`14`	`14`	`# self.name = pattern.name`
`15`	`15`	`self.docstring = self.__get_docstring__()`
`16`		`- self.name_parent = simplify_regex(parent_pattern.regex.pattern).strip('/') if parent_pattern else None`
`17`		`- self.path = self.__get_path__(parent_pattern)`
	`16`	`+ self.name_parent = simplify_regex(parent_regex).strip('/') if parent_regex else None`
	`17`	`+ self.path = self.__get_path__(parent_regex)`
`18`	`18`	`self.allowed_methods = self.__get_allowed_methods__()`
`19`	`19`	`# self.view_name = pattern.callback.__name__`
`20`	`20`	`self.errors = None`
`@@ -26,8 +26,8 @@ def __init__(self, pattern, parent_pattern=None, drf_router=None):`
`26`	`26`
`27`	`27`	`self.permissions = self.__get_permissions_class__()`
`28`	`28`
`29`		`- def __get_path__(self, parent_pattern):`
`30`		`- if parent_pattern:`
	`29`	`+ def __get_path__(self, parent_regex):`
	`30`	`+ if parent_regex:`
`31`	`31`	`return "/{0}{1}".format(self.name_parent, simplify_regex(self.pattern.regex.pattern))`
`32`	`32`	`return simplify_regex(self.pattern.regex.pattern)`
`33`	`33`

Comments

(0)