From 1c07de888eadc1333264d627ffdff1066a5f01b9 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 9 Feb 2011 11:45:53 +0100 Subject: [PATCH] bookmedia admin: added book count and book list --- apps/catalogue/admin.py | 16 +++++++++++++--- apps/catalogue/models.py | 12 ++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/apps/catalogue/admin.py b/apps/catalogue/admin.py index dd0743717..3751574aa 100644 --- a/apps/catalogue/admin.py +++ b/apps/catalogue/admin.py @@ -3,6 +3,7 @@ # 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 @@ -46,13 +47,22 @@ class FragmentAdmin(TaggableModelAdmin): ordering = ('book', 'anchor',) + +class BookMediaAdminForm(forms.ModelForm): + books = forms.CharField(required=False) + + class Meta: + model = BookMedia + + 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') search_fields = ('name',) - fields = ('type', 'name', 'file',) + fields = ('type', 'name', 'file', 'books') + readonly_fields = ('books',) diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 8411f477e..b78b5939b 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -171,11 +171,19 @@ def book_upload_path(ext=None, maxlen=100): class BookMedia(models.Model): type = models.CharField(_('type'), choices=MEDIA_FORMATS, max_length="100") - name = models.CharField(_('name'), max_length="100", blank=True) - file = models.FileField(_('file'), upload_to=book_upload_path(), blank=True) + name = models.CharField(_('name'), max_length="100") + file = models.FileField(_('file'), upload_to=book_upload_path()) uploaded_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False) extra_info = JSONField(_('extra information'), default='{}') + def book_count(self): + return self.book_set.count() + book_count.short_description = _('book count') + + def books(self): + return mark_safe('
'.join("%s" % (reverse('admin:catalogue_book_change', args=[b.id]), b.title) for b in self.book_set.all())) + books.short_description = _('books') + def __unicode__(self): return "%s (%s)" % (self.name, self.file.name.split("/")[-1]) -- 2.20.1