sortify fix

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

diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py
index dd07437..22cf15f 100644 (file)
--- a/apps/catalogue/admin.py
+++ b/apps/catalogue/admin.py
@@ -3,8 +3,9 @@
 # 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 newtagging.admin import TaggableModelAdmin, TaggableModelForm

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


@@ -18,6 +19,12 @@ 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
 


@@ -25,20 +32,21 @@ class BookAdmin(TaggableModelAdmin):
     search_fields = ('title',)
     ordering = ('title',)
 
     search_fields = ('title',)
     ordering = ('title',)
 

-    filter_horizontal = ('medias',)
+    inlines = [MediaInline]

 
     def change_view(self, request, object_id, extra_context=None):
         if not request.GET.has_key('advanced'):
 
     def change_view(self, request, object_id, extra_context=None):
         if not request.GET.has_key('advanced'):

-            self.fields = ('title', 'description', 'gazeta_link', 'wiki_link', 'pdf_file', 'medias',)
+            self.form = forms.ModelForm
+            self.fields = ('title', 'description', 'gazeta_link', 'wiki_link', 'pdf_file',)

             self.readonly_fields = ('title',)
         else:
             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)
 
 
             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(TaggableModelAdmin):
     tag_model = Tag
 


@@ -46,17 +54,6 @@ class FragmentAdmin(TaggableModelAdmin):
     ordering = ('book', 'anchor',)
 
 
     ordering = ('book', 'anchor',)
 
 

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

 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)