X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a1f86966aff87868cbc419b2d1a55d505aead21d..689050858446fed8c38d8470be29f89f70cecf04:/src/catalogue/admin.py diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py index bfa911fb..2759f9a3 100644 --- a/src/catalogue/admin.py +++ b/src/catalogue/admin.py @@ -2,10 +2,11 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django.contrib import admin +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 @@ -61,8 +62,22 @@ class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin): "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"), + ( + "date_of_birth", + "year_of_birth", + "year_of_birth_inexact", + "year_of_birth_range", + "century_of_birth", + "place_of_birth" + ), + ( + "date_of_death", + "year_of_death", + "year_of_death_inexact", + "year_of_death_range", + "century_of_death", + "place_of_death" + ), ("description", "description_preview"), "status", "collections", @@ -137,6 +152,60 @@ def add_title(base_class, 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 = [ @@ -182,6 +251,8 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): CoverLicenseFilter, 'free_license', 'polona_missing', + + FirstPublicationYearFilter, ] list_per_page = 1000000 @@ -215,6 +286,10 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): "estimated_verses", "estimate_source", + "document_book__project", + "audience", + "first_publication_year", + "monthly_views_page", "monthly_views_reader", @@ -278,6 +353,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): @@ -361,20 +437,39 @@ admin.site.register(models.Collection, CollectionAdmin) class CategoryAdmin(admin.ModelAdmin): search_fields = ["name"] + 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'] + 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'] + list_display = [ + 'name', + 'plural', + 'is_epoch_specific', + 'has_description', + ] @admin.register(models.Kind) class KindAdmin(CategoryAdmin): - list_display = ['name', 'collective_noun'] + list_display = [ + 'name', + 'collective_noun', + 'has_description', + ] @@ -393,3 +488,10 @@ admin.site.register(models.WorkType, WorkTypeAdmin) @admin.register(models.Place) class PlaceAdmin(WikidataAdminMixin, TabbedTranslationAdmin): search_fields = ['name'] + + +@admin.register(models.Thema) +class ThemaAdmin(admin.ModelAdmin): + list_display = ['code', 'name', 'usable', 'hidden'] + list_filter = ['usable', 'hidden'] + search_fields = ['code', 'name', 'description']