2 files changed, 12 insertions, 6 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index abb5de8a9..b093b383c 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -40,7 +40,7 @@ from bootstrap_datepicker.widgets import DateField
 from ishtar_common import widgets
 from ishtar_common.forms import FinalForm, FormSet, get_now, \
     reverse_lazy, TableSelect, get_data_from_formset, \
-    ManageOldType, IshtarForm, CustomForm, FieldType
+    ManageOldType, IshtarForm, CustomForm, FieldType, HistorySelect
 from ishtar_common.forms_common import TownFormSet, get_town_field, TownForm
 from ishtar_common.models import valid_id, Person, Town, \
     DocumentTemplate, Organization, get_current_profile, \
@@ -471,8 +471,10 @@ RecordRelationsFormSet.form_admin_name = _(u"Operation - 080 - Relations")
 RecordRelationsFormSet.form_slug = "operation-080-relations"
 
 
-class OperationSelect(TableSelect):
+class OperationSelect(HistorySelect):
     _model = models.Operation
+    form_admin_name = _(u"Operation - 001 - Search")
+    form_slug = "operation-001-search"
 
     search_vector = forms.CharField(
         label=_(u"Full text search"), widget=widgets.SearchWidget(
@@ -1238,8 +1240,10 @@ class OperationDeletionForm(FinalForm):
 #########
 
 
-class SiteSelect(TableSelect):
+class SiteSelect(HistorySelect):
     _model = models.ArchaeologicalSite
+    form_admin_name = _(u"Archaeological site - 001 - Search")
+    form_slug = "archaeological_site-001-search"
 
     search_vector = forms.CharField(
         label=_(u"Full text search"), widget=widgets.SearchWidget(
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 06b8b6ce9..5cf53fcbe 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -40,7 +40,7 @@ from archaeological_operations.forms import ArchaeologicalSiteForm, \
     AdministrativeActOpeModifForm, FinalAdministrativeActDeleteForm, \
     AdministrativeActRegisterFormSelection, DocumentGenerationAdminActForm, \
     SiteForm, SiteTownFormset, SiteUnderwaterForm, check_underwater_module, \
-    CourtOrderedSeizureForm
+    CourtOrderedSeizureForm, SiteSelect, OperationSelect
 from archaeological_operations.wizards import has_associated_file, \
     is_preventive, is_judiciary, OperationWizard, OperationModificationWizard, \
     OperationClosingWizard, OperationDeletionWizard, SiteSearch, \
@@ -155,7 +155,8 @@ def get_available_operation_code(request, year=None):
     return HttpResponse(data, content_type='text/plain')
 
 
-get_operation = get_item(models.Operation, 'get_operation', 'operation')
+get_operation = get_item(models.Operation, 'get_operation', 'operation',
+                         search_form=OperationSelect)
 
 show_operation = show_item(models.Operation, 'operation')
 revert_operation = revert_item(models.Operation)
@@ -348,7 +349,8 @@ def site_extra_context(request, item):
     return {'SITE_LABEL': IshtarSiteProfile.get_default_site_label()}
 
 
-get_site = get_item(models.ArchaeologicalSite, 'get_site', 'site')
+get_site = get_item(models.ArchaeologicalSite, 'get_site', 'site',
+                    search_form=SiteSelect)
 show_site = show_item(
     models.ArchaeologicalSite, 'site',
     extra_dct=site_extra_context