Merge branch 'master' of git@github.com:fnp/wolnelektury

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

diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py
index 8a718ff..564e812 100644 (file)
--- a/apps/catalogue/admin.py
+++ b/apps/catalogue/admin.py
@@ -5,7 +5,7 @@
 from django.contrib import admin
 
 from newtagging.admin import TaggableModelAdmin
-from catalogue.models import Tag, Book, Fragment, BookStub
+from catalogue.models import Tag, Book, Fragment, BookMedia
 
 
 class TagAdmin(admin.ModelAdmin):
@@ -20,8 +20,8 @@ class TagAdmin(admin.ModelAdmin):
 
 class BookAdmin(TaggableModelAdmin):
     tag_model = Tag
-    
-    list_display = ('title', 'slug', 'has_pdf_file', 'has_odt_file', 'has_html_file', 'has_description',)
+
+    list_display = ('title', 'slug', 'has_pdf_file', 'has_epub_file', 'has_html_file', 'has_description',)
     search_fields = ('title',)
     ordering = ('title',)
 
@@ -30,23 +30,20 @@ class BookAdmin(TaggableModelAdmin):
 
 class FragmentAdmin(TaggableModelAdmin):
     tag_model = Tag
-    
+
     list_display = ('book', 'anchor',)
     ordering = ('book', 'anchor',)
 
 
-class BookStubAdmin(admin.ModelAdmin):
-    # tag_model = Tag
-    
-    list_display = ('title', 'author', 'slug','pd')
-    search_fields = ('title','author')
-    ordering = ('title',)
+class MediaAdmin(admin.ModelAdmin):
+    #tag_model = BookMedia
+
+    list_display = ('type', 'name')
+    ordering = ('type', 'name')
 
-    prepopulated_fields = {'slug': ('title',)}
 
 
-admin.site.register(BookStub, BookStubAdmin)
 admin.site.register(Tag, TagAdmin)
 admin.site.register(Book, BookAdmin)
 admin.site.register(Fragment, FragmentAdmin)
-
+admin.site.register(BookMedia, MediaAdmin)