diff options
| 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 |
| commit | d1aedd5981d6dc0e2262dba67f5eddb68e5de2b3 (patch) | |
| tree | 697f2ef8414f0158e5a6b330485a1afa680b4630 | |
| parent | 6cc3ceef90190505d1ad27aa29811b194cd13926 (diff) | |
| download | Ishtar-d1aedd5981d6dc0e2262dba67f5eddb68e5de2b3.tar.bz2 Ishtar-d1aedd5981d6dc0e2262dba67f5eddb68e5de2b3.zip | |
Admin: container and warehouse performance
| -rw-r--r-- | CHANGES.md | 7 | ||||
| -rw-r--r-- | archaeological_warehouse/admin.py | 22 |
2 files changed, 20 insertions, 9 deletions
diff --git a/CHANGES.md b/CHANGES.md index 891d8aac6..77ba1f3cd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,9 +6,12 @@ date: 2023-01-13 Ishtar changelog ================ +### Bug fixes ### - Table: fix default sort when pk is not "id" -- Sheet warehouse: fix localisation - fix data -- Sheet container: fix localisation - fix data +- Sheet: + - warehouse: fix localisation - fix data + - container: fix localisation - fix data +- Admin: container and warehouse performance v4.0.34 - 2023-01-13 -------------------- 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"] |