summaryrefslogtreecommitdiff
path: root/archaeological_warehouse
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-30 17:48:11 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-30 17:48:11 +0100
commit751e5a10a2609f57171acf21a18dfe64aca9fc6e (patch)
treef7731b185b5335890cd020a871e5c78aaa5cec67 /archaeological_warehouse
parentb08c4ccb4cceee7ec2c326810e11775ad1443c10 (diff)
parent9c94fdd38c92e349ee299270226a2adc5e68f97b (diff)
downloadIshtar-751e5a10a2609f57171acf21a18dfe64aca9fc6e.tar.bz2
Ishtar-751e5a10a2609f57171acf21a18dfe64aca9fc6e.zip
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'archaeological_warehouse')
-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