X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/21df6da0980f00387d3d802aabe2b995a9c2efa4..069d8476540f79fb4c37ccd219d6b794656baf0d:/apps/catalogue/admin.py

diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py
index 050d4e197..dda39b51a 100644
--- 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
+from django import forms
 
-from newtagging.admin import TaggableModelAdmin
+from newtagging.admin import TaggableModelAdmin, TaggableModelForm
 from catalogue.models import Tag, Book, Fragment, BookMedia
 
 
@@ -18,6 +19,11 @@ class TagAdmin(admin.ModelAdmin):
     radio_fields = {'category': admin.HORIZONTAL}
 
 
+class MediaInline(admin.TabularInline):
+    model = BookMedia
+    extra = 0
+
+
 class BookAdmin(TaggableModelAdmin):
     tag_model = Tag
 
@@ -25,24 +31,21 @@ class BookAdmin(TaggableModelAdmin):
     search_fields = ('title',)
     ordering = ('title',)
 
-    filter_horizontal = ('medias',)
+    inlines = [MediaInline]
 
     def change_view(self, request, object_id, extra_context=None):
-        #my_context = {
-        #    'osm_data': self.get_osm_info(),
-        #}
-        print request.GET.keys()
         if not request.GET.has_key('advanced'):
-            self.fields = ('title', 'description', 'gazeta_link', 'wiki_link', 'pdf_file', 'medias',)
-            self.readonly_fields = ('title', 'slug',)
+            self.form = forms.ModelForm
+            self.fields = ('title', 'description', 'gazeta_link', 'wiki_link', 'pdf_file',)
+            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):
     tag_model = Tag
 
@@ -50,16 +53,6 @@ class FragmentAdmin(TaggableModelAdmin):
     ordering = ('book', 'anchor',)
 
 
-class MediaAdmin(admin.ModelAdmin):
-    #tag_model = BookMedia
-
-    list_display = ('name', 'type', 'uploaded_at')
-    ordering = ('name', 'type')
-    search_fields = ('name',)
-
-
-
 admin.site.register(Tag, TagAdmin)
 admin.site.register(Book, BookAdmin)
 admin.site.register(Fragment, FragmentAdmin)
-admin.site.register(BookMedia, MediaAdmin)