Use unmanaged keys instead of some magic.

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

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index 3534521..1bb7f83 100644 (file)
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -3,6 +3,7 @@
 #
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 #
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _

+from admin_numeric_filter.admin import RangeNumericFilter, NumericFilterModelAdmin

 from fnpdjango.actions import export_as_csv_action
 from . import models
 from .wikidata import WikidataAdminMixin
 from fnpdjango.actions import export_as_csv_action
 from . import models
 from .wikidata import WikidataAdminMixin


@@ -29,7 +30,7 @@ class AuthorAdmin(WikidataAdminMixin, admin.ModelAdmin):
 admin.site.register(models.Author, AuthorAdmin)
 
 
 admin.site.register(models.Author, AuthorAdmin)
 
 

-class BookAdmin(WikidataAdminMixin, admin.ModelAdmin):
+class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):

     list_display = [
         "title",
         "authors_str",
     list_display = [
         "title",
         "authors_str",


@@ -39,10 +40,20 @@ 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"]

     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"]
+    list_filter = [
+            "language",
+            "based_on__language",
+            ("pd_year", RangeNumericFilter),
+            "collections",
+            "collections__category",
+            "epochs", "kinds", "genres",
+            "priority",
+            "authors__gender", "authors__nationality",
+            "translators__gender", "translators__nationality",
+        ]

     readonly_fields = ["wikidata_link", "estimated_costs"]
     actions = [export_as_csv_action()]
     fieldsets = [
     readonly_fields = ["wikidata_link", "estimated_costs"]
     actions = [export_as_csv_action()]
     fieldsets = [


@@ -93,10 +104,22 @@ class BookAdmin(WikidataAdminMixin, admin.ModelAdmin):
             qs = qs.prefetch_related("authors", "translators")
         return qs
 
             qs = qs.prefetch_related("authors", "translators")
         return qs
 

+    def estimated_costs(self, obj):
+        return "\n".join(
+            "{}: {} zł".format(
+                work_type.name,
+                cost or '—'
+            )
+            for work_type, cost in obj.get_estimated_costs().items()
+        )
+

 
 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"]


@@ -112,12 +135,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', 'category', 'estimated_costs']
+    readonly_fields = ['estimated_costs']

     inlines = [AuthorInline, BookInline]
 
     inlines = [AuthorInline, BookInline]
 

+    def estimated_costs(self, obj):
+        return "\n".join(
+            "{}: {} zł".format(
+                work_type.name,
+                cost or '—'
+            )
+            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"]