Merge branch 'master' of git@github.com:fnp/wolnelektury

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

diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py
index 564e812..94f8f30 100644 (file)
--- a/apps/catalogue/admin.py
+++ b/apps/catalogue/admin.py
@@ -21,11 +21,24 @@ class TagAdmin(admin.ModelAdmin):
 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',)
 
-    prepopulated_fields = {'slug': ('title',)}
+    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'):
+            self.fields = ['title', 'description', 'gazeta_link', 'wiki_link', 'pdf_file', 'medias']
+        else:
+            self.fields = None
+        return super(BookAdmin, self).change_view(request, object_id,
+            extra_context=extra_context)
+
 
 
 class FragmentAdmin(TaggableModelAdmin):
@@ -38,8 +51,9 @@ class FragmentAdmin(TaggableModelAdmin):
 class MediaAdmin(admin.ModelAdmin):
     #tag_model = BookMedia
 
-    list_display = ('type', 'name')
-    ordering = ('type', 'name')
+    list_display = ('name', 'type', 'uploaded_at')
+    ordering = ('name', 'type')
+    search_fields = ('name',)