X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/60c19400c64c7c20ec15afdc5de26d7e6cc8fd15..13f286427e0ceb7a6c442844c447c7c3d5495871:/src/catalogue/admin.py diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py index 08f9a72a..68a362b5 100644 --- a/src/catalogue/admin.py +++ b/src/catalogue/admin.py @@ -2,17 +2,26 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django.contrib import admin -from django.utils.html import escape +from django.db.models import Min +from django.utils.html import escape, format_html from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ -from admin_numeric_filter.admin import RangeNumericFilter, NumericFilterModelAdmin +from admin_numeric_filter.admin import RangeNumericFilter, NumericFilterModelAdmin, RangeNumericForm +from admin_ordering.admin import OrderableAdmin from fnpdjango.actions import export_as_csv_action +from modeltranslation.admin import TabbedTranslationAdmin from . import models import documents.models from .wikidata import WikidataAdminMixin -class AuthorAdmin(WikidataAdminMixin, admin.ModelAdmin): +class NotableBookInline(OrderableAdmin, admin.TabularInline): + model = models.NotableBook + autocomplete_fields = ['book'] + ordering_field_hide_input = True + + +class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin): list_display = [ "first_name", "last_name", @@ -24,10 +33,60 @@ class AuthorAdmin(WikidataAdminMixin, admin.ModelAdmin): "wikidata_link", "slug", ] - list_filter = ["year_of_death", "priority", "collections", "status", "gender", "nationality"] + list_display_links = [ + "first_name", "last_name" + ] + list_filter = [ + ("year_of_death", RangeNumericFilter), + "priority", + "collections", + "status", + "gender", + "nationality", + "place_of_birth", + "place_of_death", + ("genitive", admin.EmptyFieldListFilter) + ] + list_per_page = 10000000 search_fields = ["first_name", "last_name", "wikidata"] + readonly_fields = ["wikidata_link", "description_preview"] + + fieldsets = [ + (None, {"fields": [("wikidata", "wikidata_link")]}), + ( + _("Identification"), + { + "fields": [ + ("first_name", "last_name"), + "slug", + "genitive", + "gender", + "nationality", + ("date_of_birth", "year_of_birth", "year_of_birth_inexact", "year_of_birth_range", "place_of_birth"), + ("date_of_death", "year_of_death", "year_of_death_inexact", "year_of_death_range", "place_of_death"), + ("description", "description_preview"), + "status", + "collections", + "priority", + + "notes", + "gazeta_link", + "culturepl_link", + "plwiki", + "photo", "photo_source", "photo_attribution", + ] + }, + ), + ] + prepopulated_fields = {"slug": ("first_name", "last_name")} - autocomplete_fields = ["collections"] + autocomplete_fields = ["collections", "place_of_birth", "place_of_death"] + inlines = [ + NotableBookInline, + ] + + def description_preview(self, obj): + return obj.generate_description() admin.site.register(models.Author, AuthorAdmin) @@ -36,6 +95,8 @@ admin.site.register(models.Author, AuthorAdmin) class LicenseFilter(admin.SimpleListFilter): title = 'Licencja' parameter_name = 'book_license' + license_url_field = 'document_book__dc__license' + license_name_field = 'document_book__dc__license_description' def lookups(self, requesrt, model_admin): return [ @@ -47,15 +108,91 @@ class LicenseFilter(admin.SimpleListFilter): def queryset(self, request, queryset): v = self.value() if v == 'cc': - return queryset.filter(document_book__dc__license__icontains='creativecommons.org') + return queryset.filter(**{ + self.license_url_field + '__icontains': 'creativecommons.org' + }) elif v == 'fal': - return queryset.filter(document_book__dc__license__icontains='artlibre.org') + return queryset.filter(**{ + self.license_url_field + '__icontains': 'artlibre.org' + }) elif v == 'pd': - return queryset.filter(document_book__dc__license_description__icontains='domena publiczna') + return queryset.filter(**{ + self.license_name_field + '__icontains': 'domena publiczna' + }) else: return queryset +class CoverLicenseFilter(LicenseFilter): + title = 'Licencja okładki' + parameter_name = 'cover_license' + license_url_field = 'document_book__dc_cover_image__license_url' + license_name_field = 'document_book__dc_cover_image__license_name' + + +def add_title(base_class, suffix): + class TitledCategoryFilter(base_class): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.title += suffix + return TitledCategoryFilter + + +class FirstPublicationYearFilter(admin.ListFilter): + title = 'Rok pierwszej publikacji' + parameter_name = 'first_publication_year' + template = 'admin/filter_numeric_range.html' + + def __init__(self, request, params, *args, **kwargs): + super().__init__(request, params, *args, **kwargs) + + self.request = request + + if self.parameter_name + '_from' in params: + value = params.pop(self.parameter_name + '_from') + self.used_parameters[self.parameter_name + '_from'] = value + + if self.parameter_name + '_to' in params: + value = params.pop(self.parameter_name + '_to') + self.used_parameters[self.parameter_name + '_to'] = value + + def has_output(self): + return True + + def queryset(self, request, queryset): + filters = {} + + value_from = self.used_parameters.get(self.parameter_name + '_from', None) + if value_from is not None and value_from != '': + filters.update({ + self.parameter_name + '__gte': self.used_parameters.get(self.parameter_name + '_from', None), + }) + + value_to = self.used_parameters.get(self.parameter_name + '_to', None) + if value_to is not None and value_to != '': + filters.update({ + self.parameter_name + '__lte': self.used_parameters.get(self.parameter_name + '_to', None), + }) + + return queryset.filter(**filters) + + def choices(self, changelist): + return ({ + 'request': self.request, + 'parameter_name': self.parameter_name, + 'form': RangeNumericForm(name=self.parameter_name, data={ + self.parameter_name + '_from': self.used_parameters.get(self.parameter_name + '_from', None), + self.parameter_name + '_to': self.used_parameters.get(self.parameter_name + '_to', None), + }), + }, ) + + def expected_parameters(self): + return [ + '{}_from'.format(self.parameter_name), + '{}_to'.format(self.parameter_name), + ] + + class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): list_display = [ "smart_title", @@ -80,17 +217,78 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): ("pd_year", RangeNumericFilter), "collections", "collections__category", + ("authors__collections", add_title(admin.RelatedFieldListFilter, ' autora')), + ("authors__collections__category", add_title(admin.RelatedFieldListFilter, ' autora')), + ("translators__collections", add_title(admin.RelatedFieldListFilter, ' tłumacza')), + ("translators__collections__category", add_title(admin.RelatedFieldListFilter, ' tłumacza')), "epochs", "kinds", "genres", "priority", "authors__gender", "authors__nationality", "translators__gender", "translators__nationality", + + ("authors__place_of_birth", add_title(admin.RelatedFieldListFilter, ' autora')), + ("authors__place_of_death", add_title(admin.RelatedFieldListFilter, ' autora')), + ("translators__place_of_birth", add_title(admin.RelatedFieldListFilter, ' tłumacza')), + ("translators__place_of_death", add_title(admin.RelatedFieldListFilter, ' tłumacza')), + "document_book__chunk__stage", - "document_book__chunk__user", LicenseFilter, + CoverLicenseFilter, + 'free_license', + 'polona_missing', + + FirstPublicationYearFilter, ] - readonly_fields = ["wikidata_link", "estimated_costs"] - actions = [export_as_csv_action()] + list_per_page = 1000000 + + readonly_fields = [ + "wikidata_link", + "estimated_costs", + "documents_book_link", + "scans_source_link", + "monthly_views_page", + "monthly_views_reader", + ] + actions = [export_as_csv_action( + fields=[ + "id", + "wikidata", + "slug", + "title", + "authors_first_names", + "authors_last_names", + "translators_first_names", + "translators_last_names", + "language", + "based_on", + "scans_source", + "text_source", + "notes", + "priority", + "pd_year", + "gazeta_link", + "estimated_chars", + "estimated_verses", + "estimate_source", + + "document_book__project", + "first_publication_year", + + "monthly_views_page", + "monthly_views_reader", + + # content stats + "chars", + "chars_with_fn", + "words", + "words_with_fn", + "verses", + "chars_out_verse", + "verses_with_fn", + "chars_out_verse_with_fn", + ] + )] fieldsets = [ (None, {"fields": [("wikidata", "wikidata_link")]}), ( @@ -98,11 +296,12 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): { "fields": [ "title", - "slug", + ("slug", 'documents_book_link'), "authors", "translators", "language", "based_on", + "original_year", "pd_year", ] }, @@ -121,13 +320,15 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): _("Plan"), { "fields": [ - "scans_source", + ("free_license", "polona_missing"), + ("scans_source", "scans_source_link"), "text_source", "priority", "collections", "notes", ("estimated_chars", "estimated_verses", "estimate_source"), "estimated_costs", + ("monthly_views_page", "monthly_views_reader"), ] }, ), @@ -137,6 +338,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): qs = super().get_queryset(request) if request.resolver_match.view_name.endswith("changelist"): qs = qs.prefetch_related("authors", "translators") + qs = qs.annotate(first_publication_year=Min('document_book__publish_log__timestamp__year')) return qs def estimated_costs(self, obj): @@ -161,7 +363,22 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): return '---' smart_title.short_description = _('Title') smart_title.admin_order_field = 'title' - + + def documents_book_link(self, obj): + for book in obj.document_books.all(): + return mark_safe(''.format(book.get_absolute_url(), book.slug)) + documents_book_link.short_description = _('Book') + + def scans_source_link(self, obj): + if obj.scans_source: + return format_html( + '{url}', + url=obj.scans_source, + ) + else: + return "" + scans_source_link.short_description = _('scans source') + admin.site.register(models.Book, BookAdmin) @@ -184,7 +401,7 @@ class CollectionAdmin(admin.ModelAdmin): autocomplete_fields = [] prepopulated_fields = {"slug": ("name",)} search_fields = ["name"] - fields = ['name', 'slug', 'category', 'notes', 'estimated_costs'] + fields = ['name', 'slug', 'category', 'description', 'notes', 'estimated_costs'] readonly_fields = ['estimated_costs'] inlines = [AuthorInline, BookInline] @@ -205,9 +422,39 @@ admin.site.register(models.Collection, CollectionAdmin) class CategoryAdmin(admin.ModelAdmin): search_fields = ["name"] -admin.site.register(models.Epoch, CategoryAdmin) -admin.site.register(models.Genre, CategoryAdmin) -admin.site.register(models.Kind, CategoryAdmin) + def has_description(self, obj): + return bool(obj.description) + has_description.boolean = True + has_description.short_description = 'opis' + + +@admin.register(models.Epoch) +class EpochAdmin(CategoryAdmin): + list_display = [ + 'name', + 'adjective_feminine_singular', + 'adjective_nonmasculine_plural', + 'has_description', + ] + + +@admin.register(models.Genre) +class GenreAdmin(CategoryAdmin): + list_display = [ + 'name', + 'plural', + 'is_epoch_specific', + 'has_description', + ] + + +@admin.register(models.Kind) +class KindAdmin(CategoryAdmin): + list_display = [ + 'name', + 'collective_noun', + 'has_description', + ] @@ -221,3 +468,8 @@ class WorkTypeAdmin(admin.ModelAdmin): admin.site.register(models.WorkType, WorkTypeAdmin) + + +@admin.register(models.Place) +class PlaceAdmin(WikidataAdminMixin, TabbedTranslationAdmin): + search_fields = ['name']