Fix after upgrading django-filter.

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

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index a8fc82a..47152eb 100644 (file)
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -1,15 +1,26 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from collections import Counter

 from django.contrib import admin
 from django.contrib import admin

+from django.utils.html import escape, format_html
+from django.utils.safestring import mark_safe

 from django.utils.translation import gettext_lazy as _
 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
 from . import models

+import documents.models

 from .wikidata import WikidataAdminMixin
 
 
 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",


@@ -21,18 +32,79 @@ 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)
 
 

-class BookAdmin(WikidataAdminMixin, admin.ModelAdmin):
+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 [
+            ('cc', 'CC'),
+            ('fal', 'FAL'),
+            ('pd', 'domena publiczna'),
+        ]
+
+    def queryset(self, request, queryset):
+        v = self.value()
+        if v == 'cc': 
+            return queryset.filter(**{
+                self.license_url_field + '__icontains': 'creativecommons.org'
+            })
+        elif v == 'fal':
+            return queryset.filter(**{
+                self.license_url_field + '__icontains': 'artlibre.org'
+            })
+        elif v == 'pd':
+            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 BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):

     list_display = [
     list_display = [

-        "title",
+        "smart_title",

         "authors_str",
         "translators_str",
         "language",
         "authors_str",
         "translators_str",
         "language",


@@ -40,12 +112,64 @@ class BookAdmin(WikidataAdminMixin, admin.ModelAdmin):
         "priority",
         "wikidata_link",
     ]
         "priority",
         "wikidata_link",
     ]

-    search_fields = ["title", "wikidata"]
+    search_fields = [
+        "title", "wikidata",
+        "authors__first_name", "authors__last_name",
+        "translators__first_name", "translators__last_name",
+        "scans_source", "text_source", "notes", "estimate_source",
+    ]

     autocomplete_fields = ["authors", "translators", "based_on", "collections", "epochs", "genres", "kinds"]
     prepopulated_fields = {"slug": ("title",)}
     autocomplete_fields = ["authors", "translators", "based_on", "collections", "epochs", "genres", "kinds"]
     prepopulated_fields = {"slug": ("title",)}

-    list_filter = ["language", "pd_year", "collections"]
-    readonly_fields = ["wikidata_link", "estimated_costs"]
-    actions = [export_as_csv_action()]
+    list_filter = [
+        "language",
+        "based_on__language",
+        ("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",
+
+        LicenseFilter,
+        CoverLicenseFilter,
+        'free_license',
+        'polona_missing',
+    ]
+    list_per_page = 1000000
+
+    readonly_fields = [
+        "wikidata_link",
+        "estimated_costs",
+        "documents_book_link",
+        "scans_source_link",
+    ]
+    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")]}),
         (


@@ -53,7 +177,7 @@ class BookAdmin(WikidataAdminMixin, admin.ModelAdmin):
             {
                 "fields": [
                     "title",
             {
                 "fields": [
                     "title",

-                    "slug",
+                    ("slug", 'documents_book_link'),

                     "authors",
                     "translators",
                     "language",
                     "authors",
                     "translators",
                     "language",


@@ -76,7 +200,8 @@ class BookAdmin(WikidataAdminMixin, admin.ModelAdmin):
             _("Plan"),
             {
                 "fields": [
             _("Plan"),
             {
                 "fields": [

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

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


@@ -103,10 +228,42 @@ class BookAdmin(WikidataAdminMixin, admin.ModelAdmin):
             for work_type, cost in obj.get_estimated_costs().items()
         )
 
             for work_type, cost in obj.get_estimated_costs().items()
         )
 

+    def smart_title(self, obj):
+        if obj.title:
+            return obj.title
+        if obj.notes:
+            n = obj.notes
+            if len(n) > 100:
+                n = n[:100] + '…'
+            return mark_safe(
+                '<em><small>' + escape(n) + '</small></em>'
+            )
+        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('<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)
 
 

+admin.site.register(models.CollectionCategory)
+
+

 class AuthorInline(admin.TabularInline):
     model = models.Author.collections.through
     autocomplete_fields = ["author"]
 class AuthorInline(admin.TabularInline):
     model = models.Author.collections.through
     autocomplete_fields = ["author"]


@@ -122,36 +279,24 @@ class CollectionAdmin(admin.ModelAdmin):
     autocomplete_fields = []
     prepopulated_fields = {"slug": ("name",)}
     search_fields = ["name"]
     autocomplete_fields = []
     prepopulated_fields = {"slug": ("name",)}
     search_fields = ["name"]

-    fields = ['name', 'slug', 'estimated_costs']
+    fields = ['name', 'slug', 'category', 'notes', 'estimated_costs']

     readonly_fields = ['estimated_costs']
     inlines = [AuthorInline, BookInline]
 
     def estimated_costs(self, obj):
     readonly_fields = ['estimated_costs']
     inlines = [AuthorInline, BookInline]
 
     def estimated_costs(self, obj):

-        costs = Counter()
-        for book in obj.book_set.all():
-            for k, v in book.get_estimated_costs().items():
-                costs[k] += v or 0
-
-        for author in obj.author_set.all():
-            for book in author.book_set.all():
-                for k, v in book.get_estimated_costs().items():
-                    costs[k] += v or 0
-            for book in author.translated_book_set.all():
-                for k, v in book.get_estimated_costs().items():
-                    costs[k] += v or 0
-

         return "\n".join(
             "{}: {} zł".format(
                 work_type.name,
                 cost or '—'
             )
         return "\n".join(
             "{}: {} zł".format(
                 work_type.name,
                 cost or '—'
             )

-            for work_type, cost in costs.items()
+            for work_type, cost in obj.get_estimated_costs().items()

         )
 
 
 admin.site.register(models.Collection, CollectionAdmin)
 
 
         )
 
 
 admin.site.register(models.Collection, CollectionAdmin)
 
 

+

 class CategoryAdmin(admin.ModelAdmin):
     search_fields = ["name"]
 
 class CategoryAdmin(admin.ModelAdmin):
     search_fields = ["name"]