Merge branch 'gilbert' into gilbert-1.3

[philo.git] / contrib / penfield / admin.py

diff --git a/contrib/penfield/admin.py b/contrib/penfield/admin.py
index 328394a..c70cf46 100644 (file)
--- a/contrib/penfield/admin.py
+++ b/contrib/penfield/admin.py
@@ -62,7 +62,7 @@ class BlogViewAdmin(EntityAdmin):
                        'classes': COLLAPSE_CLASSES
                }),
                ('Feed Settings', {
                        'classes': COLLAPSE_CLASSES
                }),
                ('Feed Settings', {

-                       'fields': ( 'feeds_enabled', 'feed_suffix', 'feed_type', 'item_title_template', 'item_description_template',),
+                       'fields': ( 'feeds_enabled', 'feed_suffix', 'feed_type', 'feed_length', 'item_title_template', 'item_description_template',),

                        'classes': COLLAPSE_CLASSES
                })
        )
                        'classes': COLLAPSE_CLASSES
                })
        )


@@ -127,7 +127,7 @@ class NewsletterViewAdmin(EntityAdmin):
                        'classes': COLLAPSE_CLASSES
                }),
                ('Feeds', {
                        'classes': COLLAPSE_CLASSES
                }),
                ('Feeds', {

-                       'fields': ( 'feeds_enabled', 'feed_suffix', 'feed_type', 'item_title_template', 'item_description_template',),
+                       'fields': ( 'feeds_enabled', 'feed_suffix', 'feed_type', 'feed_length', 'item_title_template', 'item_description_template',),

                        'classes': COLLAPSE_CLASSES
                })
        )
                        'classes': COLLAPSE_CLASSES
                })
        )