diff -r 5087560b51b6 -r df60d20f965c src/ldt/ldt/security/__init__.py --- a/src/ldt/ldt/security/__init__.py Thu Apr 02 17:29:54 2015 +0200 +++ b/src/ldt/ldt/security/__init__.py Fri Apr 03 17:52:48 2015 +0200 @@ -4,13 +4,12 @@ from django.core.signals import request_started from ldt.security.permissionchecker import check_object_perm_for_user -User = get_user_model() try: from threading import local except ImportError: from django.utils._threading_local import local - + _thread_locals = local() # The function that protect models is called on the first @@ -36,14 +35,14 @@ if hasattr(get_anonymous_user, 'anonymous_user'): return get_anonymous_user.anonymous_user - get_anonymous_user.anonymous_user = User.objects.get(id=settings.ANONYMOUS_USER_ID) + get_anonymous_user.anonymous_user = get_user_model().objects.get(id=settings.ANONYMOUS_USER_ID) return get_anonymous_user.anonymous_user def get_current_user_or_admin(): current = get_current_user() if current: return current - admin = User.objects.filter(is_superuser=True)[0] + admin = get_user_model().objects.filter(is_superuser=True)[0] return admin def protect_models():