summaryrefslogtreecommitdiff
path: root/archaeological_warehouse
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r--archaeological_warehouse/models.py9
-rw-r--r--archaeological_warehouse/views.py9
2 files changed, 10 insertions, 8 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 17495bf72..389cc4f5a 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -75,6 +75,15 @@ post_delete.connect(post_save_cache, sender=ContainerType)
class Container(LightHistorizedItem):
TABLE_COLS = ['reference', 'container_type', 'location']
+
+ # search parameters
+ EXTRA_REQUEST_KEYS = {
+ 'location': 'location__pk',
+ 'container_type': 'container_type__pk',
+ 'reference': 'reference__icontains',
+ }
+
+ # fields
location = models.ForeignKey(Warehouse, verbose_name=_(u"Warehouse"))
container_type = models.ForeignKey(ContainerType,
verbose_name=_("Container type"))
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index 486c2a1e0..d8027a9a6 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -29,14 +29,7 @@ from wizards import *
from ishtar_common.forms import FinalForm
from forms import *
-get_container = get_item(
- models.Container,
- 'get_container', 'container',
- extra_request_keys={
- 'location': 'location__pk',
- 'container_type': 'container_type__pk',
- 'reference': 'reference__icontains',
- })
+get_container = get_item(models.Container, 'get_container', 'container')
new_warehouse = new_item(models.Warehouse, WarehouseForm)
new_container = new_item(models.Container, ContainerForm)