Merge branch 'fast_containers' into develop

[philo.git] / philo / admin / base.py

diff --git a/philo/admin/base.py b/philo/admin/base.py
index 75fa336..81916ab 100644 (file)
--- a/philo/admin/base.py
+++ b/philo/admin/base.py
@@ -4,12 +4,13 @@ from django.contrib.contenttypes import generic
 from django.http import HttpResponse
 from django.utils import simplejson as json
 from django.utils.html import escape
+from mptt.admin import MPTTModelAdmin
+
 from philo.models import Tag, Attribute
 from philo.models.fields.entities import ForeignKeyAttribute, ManyToManyAttribute
 from philo.admin.forms.attributes import AttributeForm, AttributeInlineFormSet
 from philo.admin.widgets import TagFilteredSelectMultiple
 from philo.forms.entities import EntityForm, proxy_fields_for_entity_model
-from mptt.admin import MPTTModelAdmin
 
 
 COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)
@@ -135,11 +136,7 @@ class EntityAdmin(admin.ModelAdmin):
                return db_field.formfield(**kwargs)
 
 
-class TreeAdmin(MPTTModelAdmin):
-       pass
-
-
-class TreeEntityAdmin(EntityAdmin, TreeAdmin):
+class TreeEntityAdmin(EntityAdmin, MPTTModelAdmin):
        pass