fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minimal allauth support
[wolnelektury.git]
/
apps
/
catalogue
/
admin.py
diff --git
a/apps/catalogue/admin.py
b/apps/catalogue/admin.py
index
d11750d
..
87ab727
100644
(file)
--- a/
apps/catalogue/admin.py
+++ b/
apps/catalogue/admin.py
@@
-3,13
+3,14
@@
# 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 catalogue.models import Tag, Book, Fragment, BookMedia
+from newtagging.admin import TaggableModelAdmin
, TaggableModelForm
+from catalogue.models import Tag, Book, Fragment, BookMedia
, Collection
class TagAdmin(admin.ModelAdmin):
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',)
list_filter = ('category',)
search_fields = ('name',)
ordering = ('name',)
@@
-18,29
+19,34
@@
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
- 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',)
search_fields = ('title',)
ordering = ('title',)
- filter_horizontal = ('medias',)
+ inlines = [MediaInline]
def change_view(self, request, object_id, extra_context=None):
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')
+ 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)
-
class FragmentAdmin(TaggableModelAdmin):
tag_model = Tag
class FragmentAdmin(TaggableModelAdmin):
tag_model = Tag
@@
-48,15
+54,11
@@
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')
-
+class CollectionAdmin(admin.ModelAdmin):
+ prepopulated_fields = {'slug': ('title',)}
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, Media
Admin)
+admin.site.register(
Collection, Collection
Admin)