Merge branch 'entity_raw_id_fields'

[philo.git] / admin / pages.py

diff --git a/admin/pages.py b/admin/pages.py
index 15b06d9..13d4098 100644 (file)
--- a/admin/pages.py
+++ b/admin/pages.py
@@ -1,10 +1,10 @@
 from django.conf import settings
 from django.contrib import admin
 from django import forms
 from django.conf import settings
 from django.contrib import admin
 from django import forms

-from philo.admin.base import COLLAPSE_CLASSES
+from philo.admin.base import COLLAPSE_CLASSES, TreeAdmin

 from philo.admin.nodes import ViewAdmin
 from philo.models.pages import Page, Template, Contentlet, ContentReference
 from philo.admin.nodes import ViewAdmin
 from philo.models.pages import Page, Template, Contentlet, ContentReference

-from philo.forms import ContentletInlineFormSet, ContentReferenceInlineFormSet, ContentletForm, ContentReferenceForm
+from philo.admin.forms.containers import *

 
 
 class ContentletInline(admin.StackedInline):
 
 
 class ContentletInline(admin.StackedInline):


@@ -48,7 +48,7 @@ class PageAdmin(ViewAdmin):
        inlines = [ContentletInline, ContentReferenceInline] + ViewAdmin.inlines
 
 
        inlines = [ContentletInline, ContentReferenceInline] + ViewAdmin.inlines
 
 

-class TemplateAdmin(admin.ModelAdmin):
+class TemplateAdmin(TreeAdmin):

        prepopulated_fields = {'slug': ('name',)}
        fieldsets = (
                (None, {
        prepopulated_fields = {'slug': ('name',)}
        fieldsets = (
                (None, {