diff options
Diffstat (limited to 'archaeological_warehouse/admin.py')
| -rw-r--r-- | archaeological_warehouse/admin.py | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py index c186950d3..dad92881d 100644 --- a/archaeological_warehouse/admin.py +++ b/archaeological_warehouse/admin.py @@ -17,8 +17,6 @@ # See the file COPYING for details. -from ajax_select import make_ajax_form - from django.contrib import admin from ishtar_common.apps import admin_site @@ -36,18 +34,13 @@ class DivisionInline(admin.TabularInline): class WarehouseAdmin(HistorizedObjectAdmin): list_display = ("name", "warehouse_type", "town") list_filter = ("warehouse_type",) - search_fields = ("name", "town") + search_fields = ("name", "town", "warehouse_type") model = models.Warehouse - ajax_form_dict = HistorizedObjectAdmin.AJAX_FORM_DICT.copy() - ajax_form_dict.update( - { - "town": "town", - "precise_town": "town", - "person_in_charge": "person", - "organization": "organization", - } - ) - form = make_ajax_form(model, ajax_form_dict) + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ + "precise_town", + "person_in_charge", + "organization" + ] inlines = [DivisionInline] exclude = ["documents", "main_image"] @@ -79,11 +72,12 @@ class ContainerAdmin(HistorizedObjectAdmin): "container_type", ) list_filter = ("container_type",) + search_fields = ("reference", "container_type", "cached_label", "responsible") model = models.Container readonly_fields = HistorizedObjectAdmin.readonly_fields + ["history_date"] - ajax_form_dict = HistorizedObjectAdmin.AJAX_FORM_DICT.copy() - ajax_form_dict.update({"location": "warehouse", "responsible": "warehouse"}) - form = make_ajax_form(model, ajax_form_dict) + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ + "location", "responsible" + ] exclude = ["documents", "main_image"] |