Merge branch 'release' into gilbert

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

diff --git a/contrib/penfield/gilbert.py b/contrib/penfield/gilbert.py
index fb284a5..e6e8251 100644 (file)
--- a/contrib/penfield/gilbert.py
+++ b/contrib/penfield/gilbert.py
@@ -1,9 +1,19 @@
 from .models import Blog, BlogEntry, BlogView, NewsletterArticle, NewsletterIssue, Newsletter, NewsletterView
 from philo.contrib.gilbert import site
 from .models import Blog, BlogEntry, BlogView, NewsletterArticle, NewsletterIssue, Newsletter, NewsletterView
 from philo.contrib.gilbert import site

+from philo.contrib.gilbert.plugins.models import ModelAdmin

 
 
 
 

-site.register_model(Blog, icon_name='blog')
-site.register_model(BlogEntry, search_fields=('title', 'content',), icon_name='document-snippet')
+class BlogAdmin(ModelAdmin):
+       search_fields = ('title',)
+
+
+class BlogEntryAdmin(ModelAdmin):
+       search_fields = ('title', 'content',)
+       data_columns = ('title', 'author', 'blog', 'date',)
+
+
+site.register_model(Blog, BlogAdmin, icon_name='blog')
+site.register_model(BlogEntry, BlogEntryAdmin, icon_name='document-snippet')

 site.register_model(BlogView, icon_name='application-blog')
 site.register_model(NewsletterArticle, icon_name='document-snippet')
 site.register_model(NewsletterIssue, icon_name='newspaper')
 site.register_model(BlogView, icon_name='application-blog')
 site.register_model(NewsletterArticle, icon_name='document-snippet')
 site.register_model(NewsletterIssue, icon_name='newspaper')