From d1aedd5981d6dc0e2262dba67f5eddb68e5de2b3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 17 Jan 2023 14:03:49 +0100 Subject: Admin: container and warehouse performance --- archaeological_warehouse/admin.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'archaeological_warehouse/admin.py') diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py index dad92881d..6dd6ffde6 100644 --- a/archaeological_warehouse/admin.py +++ b/archaeological_warehouse/admin.py @@ -20,7 +20,7 @@ from django.contrib import admin from ishtar_common.apps import admin_site -from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin +from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin, MainGeoDataItem from . import models @@ -31,12 +31,14 @@ class DivisionInline(admin.TabularInline): extra = 1 -class WarehouseAdmin(HistorizedObjectAdmin): +class WarehouseAdmin(HistorizedObjectAdmin, MainGeoDataItem): list_display = ("name", "warehouse_type", "town") list_filter = ("warehouse_type",) search_fields = ("name", "town", "warehouse_type") model = models.Warehouse - autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ + readonly_fields = HistorizedObjectAdmin.readonly_fields + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + \ + MainGeoDataItem.autocomplete_fields + [ "precise_town", "person_in_charge", "organization" @@ -65,7 +67,7 @@ class ContainerTypeAdmin(GeneralTypeAdmin): admin_site.register(models.ContainerType, ContainerTypeAdmin) -class ContainerAdmin(HistorizedObjectAdmin): +class ContainerAdmin(HistorizedObjectAdmin, MainGeoDataItem): list_display = ( "reference", "location", @@ -74,9 +76,15 @@ class ContainerAdmin(HistorizedObjectAdmin): list_filter = ("container_type",) search_fields = ("reference", "container_type", "cached_label", "responsible") model = models.Container - readonly_fields = HistorizedObjectAdmin.readonly_fields + ["history_date"] - autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ - "location", "responsible" + readonly_fields = HistorizedObjectAdmin.readonly_fields + [ + "history_date", + "merge_key", + "merge_exclusion", + "merge_candidate", + ] + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + \ + MainGeoDataItem.autocomplete_fields + [ + "location", "responsible", "responsibility", "parent" ] exclude = ["documents", "main_image"] -- cgit v1.2.3