diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:23:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-03 22:23:46 +0200 |
| commit | fc835921567bde864b158f0a26a9461334b8facd (patch) | |
| tree | 15c53d3ee13d79e72be949dc98d5c31195338a59 /archaeological_warehouse/admin.py | |
| parent | 7f481fdfc8ce76e70bb4496c63770f8b5a9255b6 (diff) | |
| parent | ba25fffca393f1a92d9e91422532a1da177b9e97 (diff) | |
| download | Ishtar-fc835921567bde864b158f0a26a9461334b8facd.tar.bz2 Ishtar-fc835921567bde864b158f0a26a9461334b8facd.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_warehouse/admin.py')
| -rw-r--r-- | archaeological_warehouse/admin.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py index b76c48308..cf71dbab6 100644 --- a/archaeological_warehouse/admin.py +++ b/archaeological_warehouse/admin.py @@ -17,13 +17,13 @@ # See the file COPYING for details. -from django.conf import settings from django.contrib import admin from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin import models + class WarehouseAdmin(HistorizedObjectAdmin): list_display = ('name', 'warehouse_type', 'town') list_filter = ('warehouse_type',) @@ -32,6 +32,7 @@ class WarehouseAdmin(HistorizedObjectAdmin): admin.site.register(models.Warehouse, WarehouseAdmin) + class ContainerTypeAdmin(admin.ModelAdmin): list_display = ('label', 'reference', 'length', 'width', 'height', 'volume') @@ -39,6 +40,7 @@ class ContainerTypeAdmin(admin.ModelAdmin): admin.site.register(models.ContainerType, ContainerTypeAdmin) + class ContainerAdmin(admin.ModelAdmin): list_display = ('reference', 'location', 'container_type',) list_filter = ("container_type",) |