X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/41886adc4962a2aea572be1f71297c8a01bf99fb..945eac1969985192b4f628ec68ac3468643cb9cd:/src/catalogue/admin.py?ds=sidebyside diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py index e0c4242b..36d464c8 100644 --- a/src/catalogue/admin.py +++ b/src/catalogue/admin.py @@ -1,16 +1,22 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +import json from django.contrib import admin +from django.db.models import Min +from django import forms +from django.urls import reverse 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 reversion.admin import VersionAdmin from . import models import documents.models +import sources.models from .wikidata import WikidataAdminMixin @@ -20,7 +26,82 @@ class NotableBookInline(OrderableAdmin, admin.TabularInline): ordering_field_hide_input = True -class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin): +class WoblinkCatalogueWidget(forms.Select): + class Media: + js = ( + "admin/js/vendor/jquery/jquery.min.js", + "admin/js/vendor/select2/select2.full.min.js", + "admin/js/vendor/select2/i18n/pl.js", + "catalogue/woblink_admin.js", + "admin/js/jquery.init.js", + "admin/js/autocomplete.js", + ) + css = { + "screen": ( + "admin/css/vendor/select2/select2.min.css", + "admin/css/autocomplete.css", + ), + } + + def __init__(self): + self.attrs = {} + self.choices = [] + self.field = None + + def get_url(self): + return reverse('catalogue_woblink_autocomplete', args=[self.category]) + + def build_attrs(self, base_attrs, extra_attrs=None): + attrs = super().build_attrs(base_attrs, extra_attrs=extra_attrs) + attrs.setdefault("class", "") + attrs.update( + { + "data-ajax--cache": "true", + "data-ajax--delay": 250, + "data-ajax--type": "GET", + "data-ajax--url": self.get_url(), + "data-app-label": '', + "data-model-name": '', + "data-field-name": '', + "data-theme": "admin-autocomplete", + "data-allow-clear": json.dumps(not self.is_required), + + "data-placeholder": "", # Chyba że znaleziony? + "lang": "pl", + "class": attrs["class"] + + (" " if attrs["class"] else "") + + "admin-autocomplete admin-woblink", + } + ) + return attrs + + def optgroups(self, name, value, attrs=None): + """ Add synthetic option for keeping the current value. """ + return [(None, [ + self.create_option( + name, + v, + '(bez zmian)', + selected=True, + index=index, + attrs=attrs, + ) + for index, v in enumerate(value) + ], 0)] + +class WoblinkAuthorWidget(WoblinkCatalogueWidget): + category = 'author' + +class AuthorForm(forms.ModelForm): + class Meta: + model = models.Author + fields = '__all__' + widgets = { + 'woblink': WoblinkAuthorWidget, + } + +class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin, VersionAdmin): + form = AuthorForm list_display = [ "first_name", "last_name", @@ -30,6 +111,7 @@ class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin): "nationality", "priority", "wikidata_link", + "woblink_link", "slug", ] list_display_links = [ @@ -48,10 +130,20 @@ class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin): ] list_per_page = 10000000 search_fields = ["first_name", "last_name", "wikidata"] - readonly_fields = ["wikidata_link", "description_preview"] + readonly_fields = ["wikidata_link", "description_preview", "woblink_link"] + prepopulated_fields = {"slug": ("first_name", "last_name")} + autocomplete_fields = ["collections", "place_of_birth", "place_of_death"] + inlines = [ + NotableBookInline, + ] fieldsets = [ - (None, {"fields": [("wikidata", "wikidata_link")]}), + (None, { + "fields": [ + ("wikidata", "wikidata_link"), + ("woblink", "woblink_link"), + ] + }), ( _("Identification"), { @@ -61,8 +153,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", @@ -77,16 +183,21 @@ class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin): }, ), ] - - prepopulated_fields = {"slug": ("first_name", "last_name")} - autocomplete_fields = ["collections", "place_of_birth", "place_of_death"] - inlines = [ - NotableBookInline, - ] def description_preview(self, obj): return obj.generate_description() + def woblink_link(self, obj): + if obj.woblink: + return format_html( + '{w}', + w=obj.woblink, + slug=obj.slug, + ) + else: + return "" + woblink_link.admin_order_field = "woblink" + admin.site.register(models.Author, AuthorAdmin) @@ -137,8 +248,68 @@ 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 SourcesInline(admin.TabularInline): + model = sources.models.BookSource + extra = 1 + -class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): +class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin, VersionAdmin): + inlines = [SourcesInline] list_display = [ "smart_title", "authors_str", @@ -154,7 +325,8 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): "translators__first_name", "translators__last_name", "scans_source", "text_source", "notes", "estimate_source", ] - autocomplete_fields = ["authors", "translators", "based_on", "collections", "epochs", "genres", "kinds"] + autocomplete_fields = ["authors", "translators", "based_on", "epochs", "genres", "kinds"] + filter_horizontal = ['collections'] prepopulated_fields = {"slug": ("title",)} list_filter = [ "language", @@ -182,6 +354,8 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): CoverLicenseFilter, 'free_license', 'polona_missing', + + FirstPublicationYearFilter, ] list_per_page = 1000000 @@ -213,7 +387,24 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): "gazeta_link", "estimated_chars", "estimated_verses", - "estimate_source" + "estimate_source", + + "document_book__project", + "audience", + "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 = [ @@ -230,6 +421,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): "based_on", "original_year", "pd_year", + "plwiki", ] }, ), @@ -265,6 +457,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): @@ -309,7 +502,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): admin.site.register(models.Book, BookAdmin) -admin.site.register(models.CollectionCategory) +admin.site.register(models.CollectionCategory, VersionAdmin) class AuthorInline(admin.TabularInline): @@ -322,7 +515,7 @@ class BookInline(admin.TabularInline): autocomplete_fields = ["book"] -class CollectionAdmin(admin.ModelAdmin): +class CollectionAdmin(VersionAdmin): list_display = ["name"] autocomplete_fields = [] prepopulated_fields = {"slug": ("name",)} @@ -345,23 +538,42 @@ admin.site.register(models.Collection, CollectionAdmin) -class CategoryAdmin(admin.ModelAdmin): +class CategoryAdmin(VersionAdmin): 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', + ] @@ -370,7 +582,7 @@ class WorkRateInline(admin.TabularInline): autocomplete_fields = ['kinds', 'genres', 'epochs', 'collections'] -class WorkTypeAdmin(admin.ModelAdmin): +class WorkTypeAdmin(VersionAdmin): inlines = [WorkRateInline] admin.site.register(models.WorkType, WorkTypeAdmin) @@ -378,5 +590,38 @@ admin.site.register(models.WorkType, WorkTypeAdmin) @admin.register(models.Place) -class PlaceAdmin(WikidataAdminMixin, TabbedTranslationAdmin): +class PlaceAdmin(WikidataAdminMixin, TabbedTranslationAdmin, VersionAdmin): search_fields = ['name'] + + +@admin.register(models.Thema) +class ThemaAdmin(VersionAdmin): + list_display = ['code', 'name', 'usable', 'hidden', 'woblink_category'] + list_filter = ['usable', 'usable_as_main', 'hidden'] + search_fields = ['code', 'name', 'description', 'public_description'] + prepopulated_fields = {"slug": ["name"]} + + + +class WoblinkSeriesWidget(WoblinkCatalogueWidget): + category = 'series' + +class AudienceForm(forms.ModelForm): + class Meta: + model = models.Audience + fields = '__all__' + widgets = { + 'woblink': WoblinkSeriesWidget, + } + +@admin.register(models.Audience) +class AudienceAdmin(VersionAdmin): + form = AudienceForm + list_display = ['code', 'name', 'thema', 'woblink'] + search_fields = ['code', 'name', 'description', 'thema', 'woblink'] + prepopulated_fields = {"slug": ["name"]} + fields = ['code', 'name', 'slug', 'description', 'thema', ('woblink', 'woblink_id')] + readonly_fields = ['woblink_id'] + + def woblink_id(self, obj): + return obj.woblink or ''