fix

[wolnelektury.git] / src / catalogue / admin.py

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index 51305e2..420cd3f 100644 (file)
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -1,19 +1,25 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.contrib import admin
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.contrib import admin

-from django import forms
-
-from newtagging.admin import TaggableModelAdmin, TaggableModelForm

 from catalogue.models import Tag, Book, Fragment, BookMedia, Collection, Source
 from catalogue.models import Tag, Book, Fragment, BookMedia, Collection, Source

+from pz.admin import EmptyFieldListFilter
+
+
+class BlankFieldListFilter(EmptyFieldListFilter):
+    with_empty_str = True

 
 
 class TagAdmin(admin.ModelAdmin):
 
 
 class TagAdmin(admin.ModelAdmin):

-    list_display = ('name', 'slug', 'sort_key', 'category', 'has_description',)
+    list_display = ('name', 'slug', 'sort_key', 'category', 'has_description', 'occurrences')

     list_filter = ('category',)
     search_fields = ('name',)
     ordering = ('name',)
     list_filter = ('category',)
     search_fields = ('name',)
     ordering = ('name',)

+    readonly_fields = ('occurrences',)
+
+    def occurrences(self, tag):
+        return tag.items.count()
+    occurrences.short_description = 'Wystąpienia'

 
     prepopulated_fields = {'slug': ('name',), 'sort_key': ('name',)}
     radio_fields = {'category': admin.HORIZONTAL}
 
     prepopulated_fields = {'slug': ('name',), 'sort_key': ('name',)}
     radio_fields = {'category': admin.HORIZONTAL}


@@ -25,35 +31,30 @@ class MediaInline(admin.TabularInline):
     extra = 0
 
 
     extra = 0
 
 

-class BookAdmin(TaggableModelAdmin):
-    tag_model = Tag
-
-    list_display = ('title', 'slug', 'created_at', 'has_epub_file', 'has_html_file', 'has_description',)
+class BookAdmin(admin.ModelAdmin):
+    list_display = (
+        'title', 'slug', 'created_at', 'has_epub_file', 'has_html_file', 'has_description',
+    )
+    list_filter = [
+            'print_on_demand',
+            ('wiki_link', BlankFieldListFilter),
+            ('parent', EmptyFieldListFilter),
+            ('media', admin.EmptyFieldListFilter),
+            ]
+    date_hierarchy = 'created_at'

     search_fields = ('title',)
     ordering = ('title',)
 
     inlines = [MediaInline]
 
     search_fields = ('title',)
     ordering = ('title',)
 
     inlines = [MediaInline]
 

-    def change_view(self, request, object_id, extra_context=None):
-        if 'advanced' not in request.GET:
-            self.form = forms.ModelForm
-            self.fields = ('title', 'description', 'gazeta_link', 'wiki_link', 'recommended')
-            self.readonly_fields = ('title',)
-        else:
-            self.form = TaggableModelForm
-            self.fields = None
-            self.readonly_fields = ()
-        return super(BookAdmin, self).change_view(request, object_id, extra_context=extra_context)
-
-
-class FragmentAdmin(TaggableModelAdmin):
-    tag_model = Tag

 
 

+class FragmentAdmin(admin.ModelAdmin):

     list_display = ('book', 'anchor',)
     ordering = ('book', 'anchor',)
 
 
 class CollectionAdmin(admin.ModelAdmin):
     list_display = ('book', 'anchor',)
     ordering = ('book', 'anchor',)
 
 
 class CollectionAdmin(admin.ModelAdmin):

+    list_display = ('title', 'listed', 'role')

     prepopulated_fields = {'slug': ('title',)}
 
 
     prepopulated_fields = {'slug': ('title',)}