Move the get_permission_codename import to the main code.

cc #93
fix_request_path_info
Diederik van der Boor 2014-07-29 12:15:09 +02:00
parent bbb1cd068a
commit 14df8c529e
1 changed files with 8 additions and 6 deletions

View File

@ -18,6 +18,7 @@ from django.utils.encoding import force_text
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
try: try:
# Django 1.6 implements this # Django 1.6 implements this
from django.contrib.admin.templatetags.admin_urls import add_preserved_filters from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
@ -25,6 +26,13 @@ except ImportError:
def add_preserved_filters(context, form_url): def add_preserved_filters(context, form_url):
return form_url return form_url
try:
from django.contrib.auth import get_permission_codename
except ImportError:
# Django < 1.6
from django.contrib.auth.management import _get_permission_codename as get_permission_codename
__all__ = ( __all__ = (
'PolymorphicModelChoiceForm', 'PolymorphicParentModelAdmin', 'PolymorphicModelChoiceForm', 'PolymorphicParentModelAdmin',
@ -180,12 +188,6 @@ class PolymorphicParentModelAdmin(admin.ModelAdmin):
""" """
Return a list of polymorphic types for which the user has the permission to perform the given action. Return a list of polymorphic types for which the user has the permission to perform the given action.
""" """
try:
from django.contrib.auth import get_permission_codename
except ImportError:
# Django < 1.6
from django.contrib.auth.management import _get_permission_codename as get_permission_codename
choices = [] choices = []
for model, _ in self.get_child_models(): for model, _ in self.get_child_models():
if not request.user.has_perm('%s.%s' % (model._meta.app_label, if not request.user.has_perm('%s.%s' % (model._meta.app_label,