fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes #3405: no annotations in pictures.
[wolnelektury.git]
/
apps
/
catalogue
/
admin.py
diff --git
a/apps/catalogue/admin.py
b/apps/catalogue/admin.py
index
22cf15f
..
28cf53c
100644
(file)
--- a/
apps/catalogue/admin.py
+++ b/
apps/catalogue/admin.py
@@
-6,11
+6,11
@@
from django.contrib import admin
from django import forms
from newtagging.admin import TaggableModelAdmin, TaggableModelForm
from django import forms
from newtagging.admin import TaggableModelAdmin, TaggableModelForm
-from catalogue.models import Tag, Book, Fragment, BookMedia
+from catalogue.models import Tag, Book, Fragment, BookMedia
, Collection, Source
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',)
@@
-28,7
+28,7
@@
class MediaInline(admin.TabularInline):
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',)
@@
-37,7
+37,7
@@
class BookAdmin(TaggableModelAdmin):
def change_view(self, request, object_id, extra_context=None):
if not request.GET.has_key('advanced'):
self.form = forms.ModelForm
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',
)
+ self.fields = ('title', 'description', 'gazeta_link', 'wiki_link')
self.readonly_fields = ('title',)
else:
self.form = TaggableModelForm
self.readonly_fields = ('title',)
else:
self.form = TaggableModelForm
@@
-54,6
+54,16
@@
class FragmentAdmin(TaggableModelAdmin):
ordering = ('book', 'anchor',)
ordering = ('book', 'anchor',)
+class CollectionAdmin(admin.ModelAdmin):
+ prepopulated_fields = {'slug': ('title',)}
+
+
+class SourceAdmin(admin.ModelAdmin):
+ list_display = ('netloc', 'name')
+
+
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(Collection, CollectionAdmin)
+admin.site.register(Source, SourceAdmin)