minor template fixes

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

diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py
index d11750d..aca4f07 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
 
 


@@ -28,14 +29,14 @@ class BookAdmin(TaggableModelAdmin):
     filter_horizontal = ('medias',)
 
     def change_view(self, request, object_id, extra_context=None):
     filter_horizontal = ('medias',)
 
     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'):
         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', 'medias',)
+            self.readonly_fields = ('title',)

         else:
         else:

+            self.form = TaggableModelForm

             self.fields = None
             self.fields = None

+            self.readonly_fields = ()

         return super(BookAdmin, self).change_view(request, object_id,
             extra_context=extra_context)
 
         return super(BookAdmin, self).change_view(request, object_id,
             extra_context=extra_context)
 


@@ -48,11 +49,22 @@ class FragmentAdmin(TaggableModelAdmin):
     ordering = ('book', 'anchor',)
 
 
     ordering = ('book', 'anchor',)
 
 

+
+class BookMediaAdminForm(forms.ModelForm):
+    books = forms.CharField(required=False)
+
+    class Meta:
+        model = BookMedia
+
+

 class MediaAdmin(admin.ModelAdmin):
 class MediaAdmin(admin.ModelAdmin):

-    #tag_model = BookMedia
+    form = BookMediaAdminForm

 
 

-    list_display = ('name', 'type', 'uploaded_at')
+    list_display = ('name', 'type', 'book_count', 'uploaded_at')

     ordering = ('name', 'type')
     ordering = ('name', 'type')

+    search_fields = ('name',)
+    fields = ('type', 'name', 'file', 'books')
+    readonly_fields = ('books',)