Fixed a sobol bug which was causing search views to always use all available searches...

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

diff --git a/contrib/penfield/admin.py b/contrib/penfield/admin.py
index 5faf4ef..c70cf46 100644 (file)
--- a/contrib/penfield/admin.py
+++ b/contrib/penfield/admin.py
@@ -1,8 +1,19 @@
+from django import forms

 from django.contrib import admin
 from django.contrib import admin

-from philo.admin import EntityAdmin, AddTagAdmin
+from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect, QueryDict
+from philo.admin import EntityAdmin, AddTagAdmin, COLLAPSE_CLASSES

 from philo.contrib.penfield.models import BlogEntry, Blog, BlogView, Newsletter, NewsletterArticle, NewsletterIssue, NewsletterView
 
 
 from philo.contrib.penfield.models import BlogEntry, Blog, BlogView, Newsletter, NewsletterArticle, NewsletterIssue, NewsletterView
 
 

+class DelayedDateForm(forms.ModelForm):
+       date_field = 'date'
+       
+       def __init__(self, *args, **kwargs):
+               super(DelayedDateForm, self).__init__(*args, **kwargs)
+               self.fields[self.date_field].required = False
+
+

 class TitledAdmin(EntityAdmin):
        prepopulated_fields = {'slug': ('title',)}
        list_display = ('title', 'slug')
 class TitledAdmin(EntityAdmin):
        prepopulated_fields = {'slug': ('title',)}
        list_display = ('title', 'slug')


@@ -13,11 +24,50 @@ class BlogAdmin(TitledAdmin):
 
 
 class BlogEntryAdmin(TitledAdmin, AddTagAdmin):
 
 
 class BlogEntryAdmin(TitledAdmin, AddTagAdmin):

+       form = DelayedDateForm

        filter_horizontal = ['tags']
        filter_horizontal = ['tags']

+       list_filter = ['author', 'blog']
+       date_hierarchy = 'date'
+       search_fields = ('content',)
+       list_display = ['title', 'date', 'author']
+       raw_id_fields = ('author',)
+       fieldsets = (
+               (None, {
+                       'fields': ('title', 'author', 'blog')
+               }),
+               ('Content', {
+                       'fields': ('content', 'excerpt', 'tags'),
+               }),
+               ('Advanced', {
+                       'fields': ('slug', 'date'),
+                       'classes': COLLAPSE_CLASSES
+               })
+       )
+       related_lookup_fields = {'fk': raw_id_fields}

 
 
 class BlogViewAdmin(EntityAdmin):
 
 
 class BlogViewAdmin(EntityAdmin):

-       pass
+       fieldsets = (
+               (None, {
+                       'fields': ('blog',)
+               }),
+               ('Pages', {
+                       'fields': ('index_page', 'entry_page', 'tag_page')
+               }),
+               ('Archive Pages', {
+                       'fields': ('entry_archive_page', 'tag_archive_page')
+               }),
+               ('General Settings', {
+                       'fields': ('entry_permalink_style', 'entry_permalink_base', 'tag_permalink_base', 'entries_per_page'),
+                       'classes': COLLAPSE_CLASSES
+               }),
+               ('Feed Settings', {
+                       'fields': ( 'feeds_enabled', 'feed_suffix', 'feed_type', 'feed_length', 'item_title_template', 'item_description_template',),
+                       'classes': COLLAPSE_CLASSES
+               })
+       )
+       raw_id_fields = ('index_page', 'entry_page', 'tag_page', 'entry_archive_page', 'tag_archive_page', 'item_title_template', 'item_description_template',)
+       related_lookup_fields = {'fk': raw_id_fields}

 
 
 class NewsletterAdmin(TitledAdmin):
 
 
 class NewsletterAdmin(TitledAdmin):


@@ -25,7 +75,36 @@ class NewsletterAdmin(TitledAdmin):
 
 
 class NewsletterArticleAdmin(TitledAdmin, AddTagAdmin):
 
 
 class NewsletterArticleAdmin(TitledAdmin, AddTagAdmin):

-       filter_horizontal = TitledAdmin.filter_horizontal + ('tags', 'authors')
+       form = DelayedDateForm
+       filter_horizontal = ('tags', 'authors')
+       list_filter = ('newsletter',)
+       date_hierarchy = 'date'
+       search_fields = ('title', 'authors__name',)
+       list_display = ['title', 'date', 'author_names']
+       fieldsets = (
+               (None, {
+                       'fields': ('title', 'authors', 'newsletter')
+               }),
+               ('Content', {
+                       'fields': ('full_text', 'lede', 'tags')
+               }),
+               ('Advanced', {
+                       'fields': ('slug', 'date'),
+                       'classes': COLLAPSE_CLASSES
+               })
+       )
+       actions = ['make_issue']
+       
+       def author_names(self, obj):
+               return ', '.join([author.get_full_name() for author in obj.authors.all()])
+       author_names.short_description = "Authors"
+       
+       def make_issue(self, request, queryset):
+               opts = NewsletterIssue._meta
+               info = opts.app_label, opts.module_name
+               url = reverse("admin:%s_%s_add" % info)
+               return HttpResponseRedirect("%s?articles=%s" % (url, ",".join([str(a.pk) for a in queryset])))
+       make_issue.short_description = u"Create issue from selected %(verbose_name_plural)s"

 
 
 class NewsletterIssueAdmin(TitledAdmin):
 
 
 class NewsletterIssueAdmin(TitledAdmin):


@@ -33,7 +112,27 @@ class NewsletterIssueAdmin(TitledAdmin):
 
 
 class NewsletterViewAdmin(EntityAdmin):
 
 
 class NewsletterViewAdmin(EntityAdmin):

-       pass
+       fieldsets = (
+               (None, {
+                       'fields': ('newsletter',)
+               }),
+               ('Pages', {
+                       'fields': ('index_page', 'article_page', 'issue_page')
+               }),
+               ('Archive Pages', {
+                       'fields': ('article_archive_page', 'issue_archive_page')
+               }),
+               ('Permalinks', {
+                       'fields': ('article_permalink_style', 'article_permalink_base', 'issue_permalink_base'),
+                       'classes': COLLAPSE_CLASSES
+               }),
+               ('Feeds', {
+                       'fields': ( 'feeds_enabled', 'feed_suffix', 'feed_type', 'feed_length', 'item_title_template', 'item_description_template',),
+                       'classes': COLLAPSE_CLASSES
+               })
+       )
+       raw_id_fields = ('index_page', 'article_page', 'issue_page', 'article_archive_page', 'issue_archive_page', 'item_title_template', 'item_description_template',)
+       related_lookup_fields = {'fk': raw_id_fields}

 
 
 admin.site.register(Blog, BlogAdmin)
 
 
 admin.site.register(Blog, BlogAdmin)