Skip to content

Commit

Permalink
Merge pull request django-treebeard#17 from kezabelle/master
Browse files Browse the repository at this point in the history
Fixed ImportError in `admin_tree` occurring in current Django `master`
  • Loading branch information
tabo committed Aug 22, 2015
2 parents 7eb7e5d + ac49fff commit c2aa6a2
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion treebeard/templatetags/admin_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
from django.conf import settings
from django.contrib.admin.templatetags.admin_list import (
result_headers, result_hidden_fields)
from django.contrib.admin.util import lookup_field, display_for_field
try:
from django.contrib.admin.utils import lookup_field, display_for_field
except ImportError: # < Django 1.8
from django.contrib.admin.util import lookup_field, display_for_field
from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
from django.core.exceptions import ObjectDoesNotExist
from django.template import Library
Expand Down

0 comments on commit c2aa6a2

Please sign in to comment.