X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/87bd94a94dc6cc3dbf47db2bdd17761b3f400138..491078616e2129745f300c1f0357f5bac52e801d:/src/catalogue/admin.py?ds=sidebyside diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py index 614450eb..c319af50 100644 --- a/src/catalogue/admin.py +++ b/src/catalogue/admin.py @@ -13,8 +13,10 @@ from admin_numeric_filter.admin import RangeNumericFilter, NumericFilterModelAdm 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 @@ -24,9 +26,22 @@ class NotableBookInline(OrderableAdmin, admin.TabularInline): ordering_field_hide_input = True -class WoblinkAuthorWidget(forms.Select): +class WoblinkCatalogueWidget(forms.Select): class Media: - js = ("catalogue/woblink_admin.js",) + 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 = {} @@ -34,7 +49,7 @@ class WoblinkAuthorWidget(forms.Select): self.field = None def get_url(self): - return reverse('catalogue_woblink_author_autocomplete') + 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) @@ -60,6 +75,23 @@ class WoblinkAuthorWidget(forms.Select): ) 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 @@ -68,7 +100,7 @@ class AuthorForm(forms.ModelForm): 'woblink': WoblinkAuthorWidget, } -class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin): +class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin, VersionAdmin): form = AuthorForm list_display = [ "first_name", @@ -208,6 +240,26 @@ class CoverLicenseFilter(LicenseFilter): license_name_field = 'document_book__dc_cover_image__license_name' +class ChildrenFilter(admin.SimpleListFilter): + title = 'Status utworu podrzędnego' + parameter_name = 'book_children' + + def lookups(self, requesrt, model_admin): + return [ + ('no', 'bez podrzędnych'), + ('only', 'tylko podrzędne'), + ] + + def queryset(self, request, queryset): + v = self.value() + if v == 'no': + return queryset.filter(parent=None) + elif v == 'only': + return queryset.exclude(parent=None) + else: + return queryset + + def add_title(base_class, suffix): class TitledCategoryFilter(base_class): def __init__(self, *args, **kwargs): @@ -271,7 +323,18 @@ class FirstPublicationYearFilter(admin.ListFilter): ] -class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): +class SourcesInline(admin.TabularInline): + model = sources.models.BookSource + extra = 1 + + +class EditorNoteInline(admin.TabularInline): + model = models.EditorNote + extra = 1 + + +class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin, VersionAdmin): + inlines = [EditorNoteInline, SourcesInline] list_display = [ "smart_title", "authors_str", @@ -287,9 +350,11 @@ 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 = ["parent", "authors", "translators", "based_on", "epochs", "genres", "kinds"] + filter_horizontal = ['collections'] prepopulated_fields = {"slug": ("title",)} list_filter = [ + ChildrenFilter, "language", "based_on__language", ("pd_year", RangeNumericFilter), @@ -375,6 +440,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): { "fields": [ "title", + ("parent", "parent_number"), ("slug", 'documents_book_link'), "authors", "translators", @@ -382,6 +448,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin): "based_on", "original_year", "pd_year", + "plwiki", ] }, ), @@ -462,7 +529,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): @@ -475,7 +542,7 @@ class BookInline(admin.TabularInline): autocomplete_fields = ["book"] -class CollectionAdmin(admin.ModelAdmin): +class CollectionAdmin(VersionAdmin): list_display = ["name"] autocomplete_fields = [] prepopulated_fields = {"slug": ("name",)} @@ -498,7 +565,7 @@ admin.site.register(models.Collection, CollectionAdmin) -class CategoryAdmin(admin.ModelAdmin): +class CategoryAdmin(VersionAdmin): search_fields = ["name"] def has_description(self, obj): @@ -524,6 +591,16 @@ class GenreAdmin(CategoryAdmin): 'plural', 'is_epoch_specific', 'has_description', + 'thema', + ] + fields = [ + 'wikidata', + 'name', + 'plural', + 'slug', + 'is_epoch_specific', + 'thema', + 'description', ] @@ -542,7 +619,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) @@ -550,20 +627,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(admin.ModelAdmin): +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 ThemaAdmin(admin.ModelAdmin): - list_display = ['code', 'name', 'thema'] - search_fields = ['code', 'name', 'description', 'thema'] +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 ''