Operation search: areas criteria

2 files changed, 7 insertions, 1 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 55a9541ff..c4c61a748 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -45,7 +45,7 @@ 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, \
     person_type_pks_lazy, person_type_pk_lazy, organization_type_pks_lazy, \
-    organization_type_pk_lazy, SpatialReferenceSystem
+    organization_type_pk_lazy, SpatialReferenceSystem, Area
 from ishtar_common.wizards import MultiValueDict
 from widgets import ParcelWidget, SelectParcelWidget, OAWidget
 
@@ -488,6 +488,7 @@ class OperationSelect(HistorySelect):
     drassm_code = forms.CharField(
         label=_(u"DRASSM code"), required=False, max_length=100)
     towns = get_town_field()
+    towns__areas = forms.ChoiceField(label=_("Areas"), choices=[])
     parcel = forms.CharField(label=_(u"Parcel"))
     if settings.ISHTAR_DPTS:
         towns__numero_insee__startswith = forms.ChoiceField(
@@ -576,6 +577,7 @@ class OperationSelect(HistorySelect):
         FieldType('periods', models.Period),
         FieldType('record_quality_type', models.RecordQualityType),
         FieldType('relation_types', models.RelationType),
+        FieldType('towns__areas', Area),
     ]
     SITE_KEYS = {"archaeological_sites": None}
 
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index e54720771..d34b2f60a 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -649,6 +649,10 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem,
             pgettext_lazy("key for text search", u"town"),
             'towns__cached_label__iexact'
         ),
+        'towns__areas': SearchAltName(
+            pgettext_lazy("key for text search", u"area"),
+            'towns__areas__label__iexact'
+        ),
         'parcel': SearchAltName(
             pgettext_lazy("key for text search", u"parcel"),
             'parcels__cached_label__iexact'