Fix after upgrading django-filter.

[redakcja.git] / src / catalogue / admin.py

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index 2cab170..47152eb 100644 (file)
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -2,17 +2,25 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.contrib import admin
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.contrib import admin

-from django.utils.html import escape
+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 django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from admin_numeric_filter.admin import RangeNumericFilter, NumericFilterModelAdmin

+from admin_ordering.admin import OrderableAdmin

 from fnpdjango.actions import export_as_csv_action
 from fnpdjango.actions import export_as_csv_action

+from modeltranslation.admin import TabbedTranslationAdmin

 from . import models
 import documents.models
 from .wikidata import WikidataAdminMixin
 
 
 from . import models
 import documents.models
 from .wikidata import WikidataAdminMixin
 
 

-class AuthorAdmin(WikidataAdminMixin, admin.ModelAdmin):
+class NotableBookInline(OrderableAdmin, admin.TabularInline):
+    model = models.NotableBook
+    raw_id_fields = ['book']
+    ordering_field_hide_input = True
+
+
+class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin):

     list_display = [
         "first_name",
         "last_name",
     list_display = [
         "first_name",
         "last_name",


@@ -24,10 +32,24 @@ class AuthorAdmin(WikidataAdminMixin, admin.ModelAdmin):
         "wikidata_link",
         "slug",
     ]
         "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",
+    ]
+    list_per_page = 10000000

     search_fields = ["first_name", "last_name", "wikidata"]
     prepopulated_fields = {"slug": ("first_name", "last_name")}
     autocomplete_fields = ["collections"]
     search_fields = ["first_name", "last_name", "wikidata"]
     prepopulated_fields = {"slug": ("first_name", "last_name")}
     autocomplete_fields = ["collections"]

+    inlines = [
+        NotableBookInline,
+    ]

 
 
 admin.site.register(models.Author, AuthorAdmin)
 
 
 admin.site.register(models.Author, AuthorAdmin)


@@ -71,6 +93,15 @@ class CoverLicenseFilter(LicenseFilter):
     license_name_field = 'document_book__dc_cover_image__license_name'
 
 
     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 BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
     list_display = [
         "smart_title",
 class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
     list_display = [
         "smart_title",


@@ -95,18 +126,50 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
         ("pd_year", RangeNumericFilter),
         "collections",
         "collections__category",
         ("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",
         "document_book__chunk__stage",
         "epochs", "kinds", "genres",
         "priority",
         "authors__gender", "authors__nationality",
         "translators__gender", "translators__nationality",
         "document_book__chunk__stage",

-        "document_book__chunk__user",

 
         LicenseFilter,
         CoverLicenseFilter,
 
         LicenseFilter,
         CoverLicenseFilter,

+        'free_license',
+        'polona_missing',
+    ]
+    list_per_page = 1000000
+
+    readonly_fields = [
+        "wikidata_link",
+        "estimated_costs",
+        "documents_book_link",
+        "scans_source_link",

     ]
     ]

-    readonly_fields = ["wikidata_link", "estimated_costs", "documents_book_link"]
-    actions = [export_as_csv_action()]
+    actions = [export_as_csv_action(
+        fields=[
+            "id",
+            "wikidata",
+            "slug",
+            "title",
+            "authors_str", # authors?
+            "translators_str", # translators?
+            "language",
+            "based_on",
+            "scans_source",
+            "text_source",
+            "notes",
+            "priority",
+            "pd_year",
+            "gazeta_link",
+            "estimated_chars",
+            "estimated_verses",
+            "estimate_source"
+        ]
+    )]

     fieldsets = [
         (None, {"fields": [("wikidata", "wikidata_link")]}),
         (
     fieldsets = [
         (None, {"fields": [("wikidata", "wikidata_link")]}),
         (


@@ -137,7 +200,8 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
             _("Plan"),
             {
                 "fields": [
             _("Plan"),
             {
                 "fields": [

-                    "scans_source",
+                    ("free_license", "polona_missing"),
+                    ("scans_source", "scans_source_link"),

                     "text_source",
                     "priority",
                     "collections",
                     "text_source",
                     "priority",
                     "collections",


@@ -183,6 +247,16 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
             return mark_safe('<a style="position: absolute" href="{}"><img height="100" width="70" src="/cover/preview/{}/?height=100&width=70"></a>'.format(book.get_absolute_url(), book.slug))
     documents_book_link.short_description = _('Book')
 
             return mark_safe('<a style="position: absolute" href="{}"><img height="100" width="70" src="/cover/preview/{}/?height=100&width=70"></a>'.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(
+                '<a href="{url}" target="_blank">{url}</a>',
+                url=obj.scans_source,
+            )
+        else:
+            return ""
+    scans_source_link.short_description = _('scans source')
+

 
 admin.site.register(models.Book, BookAdmin)
 
 
 admin.site.register(models.Book, BookAdmin)