misc: import urls_utils from combo (#76286)
The existing one does not work with path() patterns.
This commit is contained in:
parent
028c51e86a
commit
c6056d676c
|
@ -16,7 +16,7 @@
|
|||
|
||||
# Decorating URL includes, <https://djangosnippets.org/snippets/2532/>
|
||||
|
||||
from django.urls.resolvers import URLPattern
|
||||
from django.urls.resolvers import URLPattern, URLResolver
|
||||
|
||||
|
||||
class DecoratedURLPattern(URLPattern):
|
||||
|
@ -27,11 +27,22 @@ class DecoratedURLPattern(URLPattern):
|
|||
return result
|
||||
|
||||
|
||||
class DecoratedURLResolver(URLResolver):
|
||||
def resolve(self, *args, **kwargs):
|
||||
result = super().resolve(*args, **kwargs)
|
||||
if result:
|
||||
result.func = self._decorate_with(result.func)
|
||||
return result
|
||||
|
||||
|
||||
def decorated_includes(func, includes, *args, **kwargs):
|
||||
urlconf_module, app_name, namespace = includes
|
||||
|
||||
for item in urlconf_module:
|
||||
item.__class__ = DecoratedURLPattern
|
||||
if isinstance(item, URLResolver):
|
||||
item.__class__ = DecoratedURLResolver
|
||||
else:
|
||||
item.__class__ = DecoratedURLPattern
|
||||
item._decorate_with = func
|
||||
|
||||
return urlconf_module, app_name, namespace
|
||||
|
|
Loading…
Reference in New Issue