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 d8fcd90..c70cf46 100644 (file)
--- a/contrib/penfield/admin.py
+++ b/contrib/penfield/admin.py
@@ -1,5 +1,7 @@
-from django.contrib import admin

 from django import forms
 from django import forms

+from django.contrib import admin
+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.admin import EntityAdmin, AddTagAdmin, COLLAPSE_CLASSES
 from philo.contrib.penfield.models import BlogEntry, Blog, BlogView, Newsletter, NewsletterArticle, NewsletterIssue, NewsletterView
 


@@ -41,6 +43,7 @@ class BlogEntryAdmin(TitledAdmin, AddTagAdmin):
                        'classes': COLLAPSE_CLASSES
                })
        )
                        'classes': COLLAPSE_CLASSES
                })
        )

+       related_lookup_fields = {'fk': raw_id_fields}

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


@@ -54,16 +57,17 @@ class BlogViewAdmin(EntityAdmin):
                ('Archive Pages', {
                        'fields': ('entry_archive_page', 'tag_archive_page')
                }),
                ('Archive Pages', {
                        'fields': ('entry_archive_page', 'tag_archive_page')
                }),

-               ('Permalinks', {
-                       'fields': ('entry_permalink_style', 'entry_permalink_base', 'tag_permalink_base'),
+               ('General Settings', {
+                       'fields': ('entry_permalink_style', 'entry_permalink_base', 'tag_permalink_base', 'entries_per_page'),

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

-               ('Feeds', {
-                       'fields': ('feed_suffix', 'feeds_enabled'),
+               ('Feed Settings', {
+                       'fields': ( 'feeds_enabled', 'feed_suffix', 'feed_type', 'feed_length', 'item_title_template', 'item_description_template',),

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

-       raw_id_fields = ('index_page', 'entry_page', 'tag_page', 'entry_archive_page', 'tag_archive_page',)
+       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):


@@ -89,10 +93,18 @@ class NewsletterArticleAdmin(TitledAdmin, AddTagAdmin):
                        'classes': COLLAPSE_CLASSES
                })
        )
                        '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 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):


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

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

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

-       raw_id_fields = ('index_page', 'article_page', 'issue_page', 'article_archive_page', 'issue_archive_page',)
+       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)