diff --git a/permission_backend_nonrel/admin.py b/permission_backend_nonrel/admin.py index d61d02b..c82f1f3 100644 --- a/permission_backend_nonrel/admin.py +++ b/permission_backend_nonrel/admin.py @@ -3,9 +3,12 @@ from django.utils.translation import ugettext from django.contrib.auth.admin import UserAdmin from django.contrib.admin.sites import NotRegistered -from django.contrib.auth.models import User, Group, Permission +from django.contrib.auth.models import Group, Permission from django.contrib.admin.widgets import FilteredSelectMultiple +from django.contrib.auth import get_user_model +User = get_user_model() + from .models import UserPermissionList, GroupPermissionList from .utils import update_permissions_user, \ update_user_groups, update_permissions_group diff --git a/permission_backend_nonrel/models.py b/permission_backend_nonrel/models.py index 0b5d952..15f3370 100644 --- a/permission_backend_nonrel/models.py +++ b/permission_backend_nonrel/models.py @@ -1,8 +1,11 @@ -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group from django.db import models from djangotoolbox.fields import ListField +from django.contrib.auth import get_user_model +User = get_user_model() + class UserPermissionList(models.Model): user = models.ForeignKey(User) diff --git a/permission_backend_nonrel/tests.py b/permission_backend_nonrel/tests.py index 30e55c9..7c0e4b6 100644 --- a/permission_backend_nonrel/tests.py +++ b/permission_backend_nonrel/tests.py @@ -1,9 +1,12 @@ from django.conf import settings from django.contrib.auth import authenticate -from django.contrib.auth.models import User, Group, Permission, AnonymousUser +from django.contrib.auth.models import Group, Permission, AnonymousUser from django.contrib.contenttypes.models import ContentType from django.test import TestCase +from django.contrib.auth import get_user_model +User = get_user_model() + from .models import UserPermissionList, \ GroupPermissionList from .utils import add_permission_to_user, \