Search - some tests, change in SearchResults cleaning.

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

diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py
index aca4f07..7ef2aca 100644 (file)
--- a/apps/catalogue/admin.py
+++ b/apps/catalogue/admin.py
@@ -10,7 +10,7 @@ from catalogue.models import Tag, Book, Fragment, BookMedia
 
 
 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',)
@@ -19,19 +19,25 @@ class TagAdmin(admin.ModelAdmin):
     radio_fields = {'category': admin.HORIZONTAL}
 
 
+class MediaInline(admin.TabularInline):
+    model = BookMedia
+    readonly_fields = ['source_sha1']
+    extra = 0
+
+
 class BookAdmin(TaggableModelAdmin):
     tag_model = Tag
 
-    list_display = ('title', 'slug', 'created_at', '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',)
 
-    filter_horizontal = ('medias',)
+    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', 'pdf_file', 'medias',)
+            self.fields = ('title', 'description', 'gazeta_link', 'wiki_link')
             self.readonly_fields = ('title',)
         else:
             self.form = TaggableModelForm
@@ -41,7 +47,6 @@ class BookAdmin(TaggableModelAdmin):
             extra_context=extra_context)
 
 
-
 class FragmentAdmin(TaggableModelAdmin):
     tag_model = Tag
 
@@ -49,26 +54,6 @@ class FragmentAdmin(TaggableModelAdmin):
     ordering = ('book', 'anchor',)
 
 
-
-class BookMediaAdminForm(forms.ModelForm):
-    books = forms.CharField(required=False)
-
-    class Meta:
-        model = BookMedia
-
-
-class MediaAdmin(admin.ModelAdmin):
-    form = BookMediaAdminForm
-
-    list_display = ('name', 'type', 'book_count', 'uploaded_at')
-    ordering = ('name', 'type')
-    search_fields = ('name',)
-    fields = ('type', 'name', 'file', 'books')
-    readonly_fields = ('books',)
-
-
-
 admin.site.register(Tag, TagAdmin)
 admin.site.register(Book, BookAdmin)
 admin.site.register(Fragment, FragmentAdmin)
-admin.site.register(BookMedia, MediaAdmin)