Added unittest for node_url templatetag. Fixed issues uncovered with unittests. Added...

[philo.git] / admin / pages.py

diff --git a/admin/pages.py b/admin/pages.py
index fe6f821..4810e0f 100644 (file)
--- a/admin/pages.py
+++ b/admin/pages.py
@@ -1,11 +1,10 @@
 from django.contrib import admin
 from django import forms
 from django.contrib import admin
 from django import forms

-from django.template import Template as DjangoTemplate

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

-from philo.forms import TemplateForm, ContentletInlineFormSet, ContentReferenceInlineFormSet
+from philo.forms import ContentletInlineFormSet, ContentReferenceInlineFormSet, ContentletForm, ContentReferenceForm

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


@@ -13,6 +12,7 @@ class ContentletInline(admin.StackedInline):
        extra = 0
        max_num = 0
        formset = ContentletInlineFormSet
        extra = 0
        max_num = 0
        formset = ContentletInlineFormSet

+       form = ContentletForm

        can_delete = False
        template = 'admin/philo/edit_inline/tabular_container.html'
 
        can_delete = False
        template = 'admin/philo/edit_inline/tabular_container.html'
 


@@ -22,6 +22,7 @@ class ContentReferenceInline(admin.StackedInline):
        extra = 0
        max_num = 0
        formset = ContentReferenceInlineFormSet
        extra = 0
        max_num = 0
        formset = ContentReferenceInlineFormSet

+       form = ContentReferenceForm

        can_delete = False
        template = 'admin/philo/edit_inline/tabular_container.html'
 
        can_delete = False
        template = 'admin/philo/edit_inline/tabular_container.html'
 


@@ -60,7 +61,6 @@ class TemplateAdmin(admin.ModelAdmin):
        save_on_top = True
        save_as = True
        list_display = ('__unicode__', 'slug', 'get_path',)
        save_on_top = True
        save_as = True
        list_display = ('__unicode__', 'slug', 'get_path',)

-       form = TemplateForm

 
 
 admin.site.register(Page, PageAdmin)
 
 
 admin.site.register(Page, PageAdmin)