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

Merge pull request #400 from amosson/develop

Browse source 
fix for django-braces>=1.4.0
This commit is contained in:
Daniel Greenfeld 2014-06-25 09:16:43 -07:00
commit 50df9addc2
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
djadmin2/viewmixins.py
View file

@ -12,7 +12,14 @@ from django.utils.encoding import force_text
from django.utils.text import get_text_list
from django.utils.translation import ugettext as _
from braces.views import AccessMixin
# braces 1.3 views exported AccessMixin
# in braces 1.4 this was moved views._access and not exported in views
# not sure if this was the intent of braces or an oversight
# if intent - should look at AccessMixin vs. using a more specific mixin
try:
from braces.views import AccessMixin
except ImportError:
from braces.views._access import AccessMixin
from . import settings, permissions
from .utils import admin2_urlname, model_options