summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-30 17:47:37 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-30 17:47:37 +0100
commit915e96df0a9d8c1328f504728d096e60cdc4851c (patch)
treea1eeb48045bb8698b25c034a5775f1898a43fb29 /archaeological_warehouse/admin.py
parent1ea02c84641ecda79cf79f8065b302bf3ccee3b9 (diff)
parent4204cc1b835cfd5bcfe3a0850372d301cc019de1 (diff)
downloadIshtar-915e96df0a9d8c1328f504728d096e60cdc4851c.tar.bz2
Ishtar-915e96df0a9d8c1328f504728d096e60cdc4851c.zip
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_warehouse/admin.py')
-rw-r--r--archaeological_warehouse/admin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py
index f2b44fcf0..7cd222e80 100644
--- a/archaeological_warehouse/admin.py
+++ b/archaeological_warehouse/admin.py
@@ -41,7 +41,7 @@ class WarehouseAdmin(HistorizedObjectAdmin):
admin_site.register(models.Warehouse, WarehouseAdmin)
-class ContainerTypeAdmin(admin.ModelAdmin):
+class ContainerTypeAdmin(GeneralTypeAdmin):
list_display = ('label', 'reference', 'length', 'width', 'height',
'volume')
model = models.ContainerType