Merge branch 'preview'

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

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index 28cf53c..93a265a 100644 (file)
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -10,12 +10,17 @@ from catalogue.models import Tag, Book, Fragment, BookMedia, Collection, Source
 
 
 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',)
+    readonly_fields = ('occurrences',)
 
-    prepopulated_fields = {'slug': ('name',), 'sort_key': ('name',),}
+    def occurrences(self, tag):
+        return tag.items.count()
+    occurrences.short_description = u'Wystąpienia'
+
+    prepopulated_fields = {'slug': ('name',), 'sort_key': ('name',)}
     radio_fields = {'category': admin.HORIZONTAL}
 
 
@@ -35,16 +40,15 @@ class BookAdmin(TaggableModelAdmin):
     inlines = [MediaInline]
 
     def change_view(self, request, object_id, extra_context=None):
-        if not request.GET.has_key('advanced'):
+        if 'advanced' not in request.GET:
             self.form = forms.ModelForm
-            self.fields = ('title', 'description', 'gazeta_link', 'wiki_link')
+            self.fields = ('title', 'description', '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)
+        return super(BookAdmin, self).change_view(request, object_id, extra_context=extra_context)
 
 
 class FragmentAdmin(TaggableModelAdmin):