Merge branch 'taggit' into develop

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

diff --git a/philo/admin/pages.py b/philo/admin/pages.py
index 96951c9..4cdd37b 100644 (file)
--- a/philo/admin/pages.py
+++ b/philo/admin/pages.py
@@ -15,9 +15,6 @@ class ContainerInline(admin.StackedInline):
        max_num = 0
        can_delete = False
        classes = ('collapse-open', 'collapse','open')
        max_num = 0
        can_delete = False
        classes = ('collapse-open', 'collapse','open')

-       formfield_overrides = {
-               TemplateField: {'widget': EmbedWidget}
-       }

        if 'grappelli' in settings.INSTALLED_APPS:
                template = 'admin/philo/edit_inline/grappelli_tabular_container.html'
        else:
        if 'grappelli' in settings.INSTALLED_APPS:
                template = 'admin/philo/edit_inline/grappelli_tabular_container.html'
        else: