Merge branch 'master' into navigation

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

diff --git a/contrib/penfield/admin.py b/contrib/penfield/admin.py
index a326d22..5faf4ef 100644 (file)
--- a/contrib/penfield/admin.py
+++ b/contrib/penfield/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
-from philo.admin import EntityAdmin
-from philo.contrib.penfield.models import BlogEntry, Blog, BlogView, Newsletter, NewsletterArticle, NewsletterIssue, NewsletterView, Test
+from philo.admin import EntityAdmin, AddTagAdmin
+from philo.contrib.penfield.models import BlogEntry, Blog, BlogView, Newsletter, NewsletterArticle, NewsletterIssue, NewsletterView
 
 
 class TitledAdmin(EntityAdmin):
@@ -12,7 +12,7 @@ class BlogAdmin(TitledAdmin):
        pass
 
 
-class BlogEntryAdmin(TitledAdmin):
+class BlogEntryAdmin(TitledAdmin, AddTagAdmin):
        filter_horizontal = ['tags']
 
 
@@ -24,8 +24,8 @@ class NewsletterAdmin(TitledAdmin):
        pass
 
 
-class NewsletterArticleAdmin(TitledAdmin):
-       pass
+class NewsletterArticleAdmin(TitledAdmin, AddTagAdmin):
+       filter_horizontal = TitledAdmin.filter_horizontal + ('tags', 'authors')
 
 
 class NewsletterIssueAdmin(TitledAdmin):
@@ -36,11 +36,6 @@ class NewsletterViewAdmin(EntityAdmin):
        pass
 
 
-class TestAdmin(admin.ModelAdmin):
-       pass
-
-
-admin.site.register(Test, TestAdmin)
 admin.site.register(Blog, BlogAdmin)
 admin.site.register(BlogEntry, BlogEntryAdmin)
 admin.site.register(BlogView, BlogViewAdmin)