Skip to content

Commit

Permalink
Merge pull request #9 from seawolf42/master
Browse files Browse the repository at this point in the history
allow for custom user models
  • Loading branch information
aburgel committed Jun 12, 2015
2 parents 9fe4752 + 23cc7b8 commit bd50dc3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
5 changes: 4 additions & 1 deletion permission_backend_nonrel/admin.py
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion 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)
Expand Down
5 changes: 4 additions & 1 deletion 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, \
Expand Down

0 comments on commit bd50dc3

Please sign in to comment.