diff options
| 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 |
| commit | f94c8d259834d838bbc84651cb4906a3e3c6b5f2 (patch) | |
| tree | 0ad4209416bb5b8c920a889d975ab1a0664ae4f4 /archaeological_warehouse/admin.py | |
| parent | 237ed2e28b96640783ae53125731603ca3bb6d2a (diff) | |
| parent | 581dad7b027cb8d7b4ae97a9e82345f079d18f9a (diff) | |
| download | Ishtar-f94c8d259834d838bbc84651cb4906a3e3c6b5f2.tar.bz2 Ishtar-f94c8d259834d838bbc84651cb4906a3e3c6b5f2.zip | |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'archaeological_warehouse/admin.py')
| -rw-r--r-- | archaeological_warehouse/admin.py | 7 |
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', |