Merge branch 'staging'

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

diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py
index 88f549f..5739cdc 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 django.contrib import admin
 
 from newtagging.admin import TaggableModelAdmin

-from catalogue.models import Tag, Book, Fragment, BookStub, BookMedia
+from catalogue.models import Tag, Book, Fragment, BookMedia

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


@@ -21,7 +21,7 @@ class TagAdmin(admin.ModelAdmin):
 class BookAdmin(TaggableModelAdmin):
     tag_model = Tag
 
 class BookAdmin(TaggableModelAdmin):
     tag_model = Tag
 

-    list_display = ('title', 'slug', 'has_pdf_file', 'has_epub_file', 'has_html_file', 'has_description',)
+    list_display = ('title', 'slug', 'created_at', 'has_pdf_file', 'has_epub_file', 'has_html_file', 'has_description',)

     search_fields = ('title',)
     ordering = ('title',)
 
     search_fields = ('title',)
     ordering = ('title',)
 


@@ -35,15 +35,6 @@ class FragmentAdmin(TaggableModelAdmin):
     ordering = ('book', 'anchor',)
 
 
     ordering = ('book', 'anchor',)
 
 

-class BookStubAdmin(admin.ModelAdmin):
-    # tag_model = Tag
-
-    list_display = ('title', 'author', 'slug','pd')
-    search_fields = ('title','author')
-    ordering = ('title',)
-
-    prepopulated_fields = {'slug': ('title',)}
-

 class MediaAdmin(admin.ModelAdmin):
     #tag_model = BookMedia
 
 class MediaAdmin(admin.ModelAdmin):
     #tag_model = BookMedia
 


@@ -52,7 +43,6 @@ class MediaAdmin(admin.ModelAdmin):
 
 
 
 
 
 

-admin.site.register(BookStub, BookStubAdmin)

 admin.site.register(Tag, TagAdmin)
 admin.site.register(Book, BookAdmin)
 admin.site.register(Fragment, FragmentAdmin)
 admin.site.register(Tag, TagAdmin)
 admin.site.register(Book, BookAdmin)
 admin.site.register(Fragment, FragmentAdmin)