Fix.

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

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index 7eafe7b..c319af5 100644 (file)
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -13,6 +13,7 @@ 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 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 . import models
 import documents.models
 import sources.models


@@ -99,7 +100,7 @@ class AuthorForm(forms.ModelForm):
             'woblink': WoblinkAuthorWidget,
         }
 
             'woblink': WoblinkAuthorWidget,
         }
 

-class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin):
+class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin, VersionAdmin):

     form = AuthorForm
     list_display = [
         "first_name",
     form = AuthorForm
     list_display = [
         "first_name",


@@ -239,6 +240,26 @@ class CoverLicenseFilter(LicenseFilter):
     license_name_field = 'document_book__dc_cover_image__license_name'
 
 
     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):
 def add_title(base_class, suffix):
     class TitledCategoryFilter(base_class):
         def __init__(self, *args, **kwargs):


@@ -307,8 +328,13 @@ class SourcesInline(admin.TabularInline):
     extra = 1
 
 
     extra = 1
 
 

-class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
-    inlines = [SourcesInline]
+class EditorNoteInline(admin.TabularInline):
+    model = models.EditorNote
+    extra = 1
+
+
+class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin, VersionAdmin):
+    inlines = [EditorNoteInline, SourcesInline]

     list_display = [
         "smart_title",
         "authors_str",
     list_display = [
         "smart_title",
         "authors_str",


@@ -324,10 +350,11 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
         "translators__first_name", "translators__last_name",
         "scans_source", "text_source", "notes", "estimate_source",
     ]
         "translators__first_name", "translators__last_name",
         "scans_source", "text_source", "notes", "estimate_source",
     ]

-    autocomplete_fields = ["authors", "translators", "based_on", "epochs", "genres", "kinds"]
+    autocomplete_fields = ["parent", "authors", "translators", "based_on", "epochs", "genres", "kinds"]

     filter_horizontal = ['collections']
     prepopulated_fields = {"slug": ("title",)}
     list_filter = [
     filter_horizontal = ['collections']
     prepopulated_fields = {"slug": ("title",)}
     list_filter = [

+        ChildrenFilter,

         "language",
         "based_on__language",
         ("pd_year", RangeNumericFilter),
         "language",
         "based_on__language",
         ("pd_year", RangeNumericFilter),


@@ -413,6 +440,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
             {
                 "fields": [
                     "title",
             {
                 "fields": [
                     "title",

+                    ("parent", "parent_number"),

                     ("slug", 'documents_book_link'),
                     "authors",
                     "translators",
                     ("slug", 'documents_book_link'),
                     "authors",
                     "translators",


@@ -501,7 +529,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
 admin.site.register(models.Book, BookAdmin)
 
 
 admin.site.register(models.Book, BookAdmin)
 
 

-admin.site.register(models.CollectionCategory)
+admin.site.register(models.CollectionCategory, VersionAdmin)

 
 
 class AuthorInline(admin.TabularInline):
 
 
 class AuthorInline(admin.TabularInline):


@@ -514,7 +542,7 @@ class BookInline(admin.TabularInline):
     autocomplete_fields = ["book"]
 
 
     autocomplete_fields = ["book"]
 
 

-class CollectionAdmin(admin.ModelAdmin):
+class CollectionAdmin(VersionAdmin):

     list_display = ["name"]
     autocomplete_fields = []
     prepopulated_fields = {"slug": ("name",)}
     list_display = ["name"]
     autocomplete_fields = []
     prepopulated_fields = {"slug": ("name",)}


@@ -537,7 +565,7 @@ admin.site.register(models.Collection, CollectionAdmin)
 
 
 
 
 
 

-class CategoryAdmin(admin.ModelAdmin):
+class CategoryAdmin(VersionAdmin):

     search_fields = ["name"]
 
     def has_description(self, obj):
     search_fields = ["name"]
 
     def has_description(self, obj):


@@ -563,6 +591,16 @@ class GenreAdmin(CategoryAdmin):
         'plural',
         'is_epoch_specific',
         'has_description',
         'plural',
         'is_epoch_specific',
         'has_description',

+        'thema',
+    ]
+    fields = [
+        'wikidata',
+        'name',
+        'plural',
+        'slug',
+        'is_epoch_specific',
+        'thema',
+        'description',

     ]
 
 
     ]
 
 


@@ -581,7 +619,7 @@ class WorkRateInline(admin.TabularInline):
     autocomplete_fields = ['kinds', 'genres', 'epochs', 'collections']
 
 
     autocomplete_fields = ['kinds', 'genres', 'epochs', 'collections']
 
 

-class WorkTypeAdmin(admin.ModelAdmin):
+class WorkTypeAdmin(VersionAdmin):

     inlines = [WorkRateInline]
 
 admin.site.register(models.WorkType, WorkTypeAdmin)
     inlines = [WorkRateInline]
 
 admin.site.register(models.WorkType, WorkTypeAdmin)


@@ -589,12 +627,12 @@ admin.site.register(models.WorkType, WorkTypeAdmin)
 
 
 @admin.register(models.Place)
 
 
 @admin.register(models.Place)

-class PlaceAdmin(WikidataAdminMixin, TabbedTranslationAdmin):
+class PlaceAdmin(WikidataAdminMixin, TabbedTranslationAdmin, VersionAdmin):

     search_fields = ['name']
 
 
 @admin.register(models.Thema)
     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']
     list_display = ['code', 'name', 'usable', 'hidden', 'woblink_category']
     list_filter = ['usable', 'usable_as_main', 'hidden']
     search_fields = ['code', 'name', 'description', 'public_description']


@@ -614,7 +652,7 @@ class AudienceForm(forms.ModelForm):
         }
 
 @admin.register(models.Audience)
         }
 
 @admin.register(models.Audience)

-class AudienceAdmin(admin.ModelAdmin):
+class AudienceAdmin(VersionAdmin):

     form = AudienceForm
     list_display = ['code', 'name', 'thema', 'woblink']
     search_fields = ['code', 'name', 'description', 'thema', 'woblink']
     form = AudienceForm
     list_display = ['code', 'name', 'thema', 'woblink']
     search_fields = ['code', 'name', 'description', 'thema', 'woblink']