summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-01-17 14:03:49 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2023-01-17 14:03:49 +0100
commitd9d1884f0e1c8fbe65be2bd13b499cf217930efe (patch)
tree697f2ef8414f0158e5a6b330485a1afa680b4630 /archaeological_warehouse/admin.py
parent7e94c345502aef31adaf40799f17e130e2cdd892 (diff)
downloadIshtar-d9d1884f0e1c8fbe65be2bd13b499cf217930efe.tar.bz2
Ishtar-d9d1884f0e1c8fbe65be2bd13b499cf217930efe.zip
Admin: container and warehouse performance
Diffstat (limited to 'archaeological_warehouse/admin.py')
-rw-r--r--archaeological_warehouse/admin.py22
1 files changed, 15 insertions, 7 deletions
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"]