diff options
| -rw-r--r-- | archaeological_warehouse/admin.py | 4 | ||||
| -rw-r--r-- | ishtar_common/admin.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py index ef6a8d1c2..65b5d879e 100644 --- a/archaeological_warehouse/admin.py +++ b/archaeological_warehouse/admin.py @@ -53,10 +53,10 @@ admin_site.register(models.Warehouse, WarehouseAdmin) class ContainerTypeAdmin(GeneralTypeAdmin): - list_display = ('label', 'reference', 'stationary', 'length', 'width', + LIST_DISPLAY = ('label', 'reference', 'stationary', 'length', 'width', 'height', 'volume') model = models.ContainerType - list_filter= ("available", "stationary") + list_filter = ("available", "stationary") admin_site.register(models.ContainerType, ContainerTypeAdmin) diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index be6302562..f8c2ea30d 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -909,13 +909,13 @@ class GeneralTypeAdmin(ImportActionAdmin, ImportJSONActionAdmin): actions = [export_as_csv_action(), serialize_type_action] prepopulated_fields = {"txt_idx": ("label",)} extra_list_display = [] + LIST_DISPLAY = ['label', 'txt_idx', 'available', 'comment'] def get_list_display(self, request): + list_display = list(self.LIST_DISPLAY)[:] if hasattr(self.model, "parent"): - return ['label', 'txt_idx', 'parent', 'available', 'comment'] + \ - self.extra_list_display - return ['label', 'txt_idx', 'available', 'comment'] + \ - self.extra_list_display + list_display.insert(2, "parent") + return list_display + self.extra_list_display @csrf_protect_m def get_changelist_queryset(self, request): |