Hopiu/django-authority
1
0
Fork 0
mirror of https://github.com/jazzband/django-authority.git synced 2026-03-16 22:20:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #33 from DylanLukes/master

Browse source 
Django 1.7 compatibility
This commit is contained in:
Bob Cribbs 2015-11-10 18:10:28 +02:00
commit e712aa607e
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
authority/admin.py
View file

@ -1,3 +1,4 @@
import django
from django import forms, template
from django.http import HttpResponseRedirect
from django.utils.translation import ugettext, ungettext, ugettext_lazy as _
@ -20,6 +21,11 @@ try:
except ImportError:
actions = False
# From 1.7 forward, Django consistenly uses the name "utils",
# not "util". We alias for backwards compatibility.
if django.VERSION[:2] < (1, 7):
forms.utils = forms.util
from authority.models import Permission
from authority.widgets import GenericForeignKeyRawIdWidget
from authority import get_choices_for
@ -40,7 +46,7 @@ class ActionPermissionInline(PermissionInline):
raw_id_fields = ()
template = 'admin/edit_inline/action_tabular.html'
class ActionErrorList(forms.util.ErrorList):
class ActionErrorList(forms.utils.ErrorList):
def __init__(self, inline_formsets):
for inline_formset in inline_formsets:
self.extend(inline_formset.non_form_errors())

11
authority/utils.py
View file

@ -1,8 +1,17 @@
import django
from django.conf import settings
from django.contrib import auth
def get_user_class():
if hasattr(auth, "get_user_model"):
"""
Returns the User model class. In Django 1.7 and above, get_user_model()
internally uses the App Registry, which may not be queried until it is ready.
We can break this cycle via indirection by returning a string instead.
"""
if django.VERSION[:2] >= (1, 7):
return settings.AUTH_USER_MODEL
elif hasattr(auth, "get_user_model"):
return auth.get_user_model()
else:
return auth.models.User