2 files changed, 12 insertions, 6 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index 9175a78d6..0ac3ddeae 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -33,7 +33,7 @@ from ishtar_common import widgets
 from bootstrap_datepicker.widgets import DatePicker
 from ishtar_common.forms import name_validator, reverse_lazy, \
     get_form_selection, TableSelect, ManageOldType, FinalForm, FormSet, \
-    CustomForm, FieldType
+    CustomForm, FieldType, HistorySelect
 from ishtar_common.forms_common import get_image_help
 from archaeological_finds.forms import FindMultipleFormSelection, \
     SelectFindBasketForm
@@ -80,8 +80,10 @@ SelectedDivisionFormset.form_admin_name = _(u"Warehouse - 020 - Divisions")
 SelectedDivisionFormset.form_slug = "warehouse-020-divisions"
 
 
-class WarehouseSelect(TableSelect):
+class WarehouseSelect(HistorySelect):
     _model = models.Warehouse
+    form_admin_name = _(u"Warehouse - 001 - Search")
+    form_slug = "warehouse-001-search"
 
     search_vector = forms.CharField(
         label=_(u"Full text search"), widget=widgets.SearchWidget(
@@ -246,8 +248,10 @@ class ContainerModifyForm(ContainerForm):
         return cleaned_data
 
 
-class ContainerSelect(TableSelect):
+class ContainerSelect(HistorySelect):
     _model = models.Container
+    form_admin_name = _(u"Container - 001 - Search")
+    form_slug = "container-001-search"
 
     search_vector = forms.CharField(
         label=_(u"Full text search"), widget=widgets.SearchWidget(
diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py
index 83fd7f4e1..42faafca0 100644
--- a/archaeological_warehouse/views.py
+++ b/archaeological_warehouse/views.py
@@ -31,7 +31,7 @@ from archaeological_warehouse.forms import WarehouseForm, ContainerForm, \
     ContainerFormSelection, BasePackagingForm, WarehouseFormSelection, \
     SelectedDivisionFormset, WarehouseDeletionForm, \
     MainContainerFormSelection, ContainerModifyForm, LocalisationForm, \
-    ContainerDeletionForm
+    ContainerDeletionForm, ContainerSelect, WarehouseSelect
 from ishtar_common.forms import FinalForm
 
 from ishtar_common.views_item import get_item, show_item, new_item
@@ -42,10 +42,12 @@ from archaeological_warehouse.wizards import PackagingWizard, WarehouseSearch, \
     ContainerSearch, ContainerWizard, ContainerModificationWizard, \
     ContainerDeletionWizard
 
-get_container = get_item(models.Container, 'get_container', 'container')
+get_container = get_item(models.Container, 'get_container', 'container',
+                         search_form=ContainerSelect)
 show_container = show_item(models.Container, 'container')
 
-get_warehouse = get_item(models.Warehouse, 'get_warehouse', 'warehouse')
+get_warehouse = get_item(models.Warehouse, 'get_warehouse', 'warehouse',
+                         search_form=WarehouseSelect)
 show_warehouse = show_item(models.Warehouse, 'warehouse')
 
 new_warehouse = new_item(models.Warehouse, WarehouseForm)