Merge branch 'master' into rwd

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

diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py
index 88f549f..87ab727 100644 (file)
--- a/apps/catalogue/admin.py
+++ b/apps/catalogue/admin.py
@@ -3,13 +3,14 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.contrib import admin
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.contrib import admin

+from django import forms

 
 

-from newtagging.admin import TaggableModelAdmin
-from catalogue.models import Tag, Book, Fragment, BookStub, BookMedia
+from newtagging.admin import TaggableModelAdmin, TaggableModelForm
+from catalogue.models import Tag, Book, Fragment, BookMedia, Collection

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

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

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


@@ -18,14 +19,32 @@ class TagAdmin(admin.ModelAdmin):
     radio_fields = {'category': admin.HORIZONTAL}
 
 
     radio_fields = {'category': admin.HORIZONTAL}
 
 

+class MediaInline(admin.TabularInline):
+    model = BookMedia
+    readonly_fields = ['source_sha1']
+    extra = 0
+
+

 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_epub_file', 'has_html_file', 'has_description',)

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

-    prepopulated_fields = {'slug': ('title',)}
+    inlines = [MediaInline]
+
+    def change_view(self, request, object_id, extra_context=None):
+        if not request.GET.has_key('advanced'):
+            self.form = forms.ModelForm
+            self.fields = ('title', 'description', 'gazeta_link', 'wiki_link')
+            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):
 
 
 class FragmentAdmin(TaggableModelAdmin):


@@ -35,25 +54,11 @@ 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',)
-
+class CollectionAdmin(admin.ModelAdmin):

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

-class MediaAdmin(admin.ModelAdmin):
-    #tag_model = BookMedia
-
-    list_display = ('type', 'name')
-    ordering = ('type', 'name')
-
-

 
 

-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)

-admin.site.register(BookMedia, MediaAdmin)
+admin.site.register(Collection, CollectionAdmin)