X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/631e1c32e1c23b24eda0c747f6bbd30cb394b791..702fb2526face0e696facae2fe725495bfad1274:/src/catalogue/admin.py?ds=inline

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index 47152ebb..2cffc743 100644
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -16,7 +16,7 @@ from .wikidata import WikidataAdminMixin
 
 class NotableBookInline(OrderableAdmin, admin.TabularInline):
     model = models.NotableBook
-    raw_id_fields = ['book']
+    autocomplete_fields = ['book']
     ordering_field_hide_input = True
 
 
@@ -42,15 +42,51 @@ class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin):
         "status",
         "gender",
         "nationality",
+        "place_of_birth",
+        "place_of_death",
+        ("genitive", admin.EmptyFieldListFilter)
     ]
     list_per_page = 10000000
     search_fields = ["first_name", "last_name", "wikidata"]
+    readonly_fields = ["wikidata_link", "description_preview"]
+
+    fieldsets = [
+        (None, {"fields": [("wikidata", "wikidata_link")]}),
+        (
+            _("Identification"),
+            {
+                "fields": [
+                    ("first_name", "last_name"),
+                    "slug",
+                    "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"),
+                    ("description", "description_preview"),
+                    "status",
+                    "collections",
+                    "priority",
+                    
+                    "notes",
+                    "gazeta_link",
+                    "culturepl_link",
+                    "plwiki",
+                    "photo", "photo_source", "photo_attribution",
+                ]
+            },
+        ),
+    ]
+    
     prepopulated_fields = {"slug": ("first_name", "last_name")}
-    autocomplete_fields = ["collections"]
+    autocomplete_fields = ["collections", "place_of_birth", "place_of_death"]
     inlines = [
         NotableBookInline,
     ]
 
+    def description_preview(self, obj):
+        return obj.generate_description()
+
 
 admin.site.register(models.Author, AuthorAdmin)
 
@@ -134,6 +170,12 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
         "priority",
         "authors__gender", "authors__nationality",
         "translators__gender", "translators__nationality",
+
+        ("authors__place_of_birth", add_title(admin.RelatedFieldListFilter, ' autora')),
+        ("authors__place_of_death", add_title(admin.RelatedFieldListFilter, ' autora')),
+        ("translators__place_of_birth", add_title(admin.RelatedFieldListFilter, ' tłumacza')),
+        ("translators__place_of_death", add_title(admin.RelatedFieldListFilter, ' tłumacza')),
+
         "document_book__chunk__stage",
 
         LicenseFilter,
@@ -155,8 +197,10 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
             "wikidata",
             "slug",
             "title",
-            "authors_str", # authors?
-            "translators_str", # translators?
+            "authors_first_names",
+            "authors_last_names",
+            "translators_first_names",
+            "translators_last_names",
             "language",
             "based_on",
             "scans_source",
@@ -182,6 +226,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
                     "translators",
                     "language",
                     "based_on",
+                    "original_year",
                     "pd_year",
                 ]
             },
@@ -279,7 +324,7 @@ class CollectionAdmin(admin.ModelAdmin):
     autocomplete_fields = []
     prepopulated_fields = {"slug": ("name",)}
     search_fields = ["name"]
-    fields = ['name', 'slug', 'category', 'notes', 'estimated_costs']
+    fields = ['name', 'slug', 'category', 'description', 'notes', 'estimated_costs']
     readonly_fields = ['estimated_costs']
     inlines = [AuthorInline, BookInline]
 
@@ -300,9 +345,20 @@ admin.site.register(models.Collection, CollectionAdmin)
 class CategoryAdmin(admin.ModelAdmin):
     search_fields = ["name"]
 
-admin.site.register(models.Epoch, CategoryAdmin)
-admin.site.register(models.Genre, CategoryAdmin)
-admin.site.register(models.Kind, CategoryAdmin)
+
+@admin.register(models.Epoch)
+class EpochAdmin(CategoryAdmin):
+    list_display = ['name', 'adjective_feminine_singular', 'adjective_nonmasculine_plural']
+
+
+@admin.register(models.Genre)
+class GenreAdmin(CategoryAdmin):
+    list_display = ['name', 'plural', 'is_epoch_specific']
+
+
+@admin.register(models.Kind)
+class KindAdmin(CategoryAdmin):
+    list_display = ['name', 'collective_noun']
 
 
 
@@ -316,3 +372,8 @@ class WorkTypeAdmin(admin.ModelAdmin):
 
 admin.site.register(models.WorkType, WorkTypeAdmin)
 
+
+
+@admin.register(models.Place)
+class PlaceAdmin(WikidataAdminMixin, TabbedTranslationAdmin):
+    search_fields = ['name']