misc: update decorated_includes() for new django patterns (#36331)

This commit is contained in:
Frédéric Péters 2019-09-21 21:17:30 +02:00
parent bd6dbe50fd
commit 7810f16265
1 changed files with 11 additions and 16 deletions

View File

@ -16,42 +16,37 @@
# Decorating URL includes, <https://djangosnippets.org/snippets/2532/>
import django
from django.contrib.auth.decorators import user_passes_test
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
from django.db.models import Q
from .agendas.models import Agenda
if django.VERSION < (2, 0, 0):
from django.urls.resolvers import RegexURLPattern as URLPattern
else:
from django.urls.resolvers import URLPattern
class DecoratedURLPattern(RegexURLPattern):
class DecoratedURLPattern(URLPattern):
def resolve(self, *args, **kwargs):
result = super(DecoratedURLPattern, self).resolve(*args, **kwargs)
if result:
result.func = self._decorate_with(result.func)
return result
class DecoratedRegexURLResolver(RegexURLResolver):
def resolve(self, *args, **kwargs):
result = super(DecoratedRegexURLResolver, self).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:
if isinstance(item, RegexURLPattern):
item.__class__ = DecoratedURLPattern
item._decorate_with = func
elif isinstance(item, RegexURLResolver):
item.__class__ = DecoratedRegexURLResolver
item._decorate_with = func
item.__class__ = DecoratedURLPattern
item._decorate_with = func
return urlconf_module, app_name, namespace
def manager_required(function=None, login_url=None):
def check_manager(user):
if user and user.is_staff: