summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-20 17:34:56 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-20 17:34:56 +0200
commite5366396850d269e91be1d794c5465e0ce4acce3 (patch)
tree0ad4209416bb5b8c920a889d975ab1a0664ae4f4 /archaeological_warehouse/admin.py
parentac4627c0895bc0aa2c355af675e8e440b3f3f711 (diff)
parent62912cc4ec70bf5ec9dc3183ce83e85ad72373fb (diff)
downloadIshtar-e5366396850d269e91be1d794c5465e0ce4acce3.tar.bz2
Ishtar-e5366396850d269e91be1d794c5465e0ce4acce3.zip
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'archaeological_warehouse/admin.py')
-rw-r--r--archaeological_warehouse/admin.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py
index deaffde94..f2b44fcf0 100644
--- a/archaeological_warehouse/admin.py
+++ b/archaeological_warehouse/admin.py
@@ -36,9 +36,7 @@ class WarehouseAdmin(HistorizedObjectAdmin):
'town': 'town',
'person_in_charge': 'person'
})
- readonly_fields = HistorizedObjectAdmin.readonly_fields + [
- 'imports'
- ]
+
admin_site.register(models.Warehouse, WarehouseAdmin)
@@ -48,6 +46,7 @@ class ContainerTypeAdmin(admin.ModelAdmin):
'volume')
model = models.ContainerType
+
admin_site.register(models.ContainerType, ContainerTypeAdmin)
@@ -56,7 +55,7 @@ class ContainerAdmin(HistorizedObjectAdmin):
list_filter = ("container_type",)
model = models.Container
readonly_fields = HistorizedObjectAdmin.readonly_fields + [
- 'imports', 'history_date'
+ 'history_date'
]
form = make_ajax_form(model, {
'location': 'warehouse',