diff options
| 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 |
| commit | 9c94fdd38c92e349ee299270226a2adc5e68f97b (patch) | |
| tree | a1eeb48045bb8698b25c034a5775f1898a43fb29 /archaeological_warehouse | |
| parent | 650b7eb8b124a7257d14eb20ee1b9e17fbd8e8ea (diff) | |
| parent | 924a81fbacac149db747294da64370dafc45043e (diff) | |
| download | Ishtar-9c94fdd38c92e349ee299270226a2adc5e68f97b.tar.bz2 Ishtar-9c94fdd38c92e349ee299270226a2adc5e68f97b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/admin.py | 2 |
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 |