Manage operation relation types in context record and find searches (refs #2799)

1 files changed, 9 insertions, 1 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 7572b0bcb..512d2069b 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -30,7 +30,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.models import valid_id
 from archaeological_operations.models import Period, Parcel, Operation, \
-    ArchaeologicalSite
+    ArchaeologicalSite, RelationType as OpeRelationType
 import models
 
 from ishtar_common import widgets
@@ -56,6 +56,9 @@ class RecordSelect(TableSelect):
             reverse_lazy('autocomplete-archaeologicalsite'),
             associated_model=ArchaeologicalSite),
         validators=[valid_id(ArchaeologicalSite)])
+    ope_relation_types = forms.MultipleChoiceField(
+        label=_(u"Search within operation relations"), choices=[],
+        widget=forms.CheckboxSelectMultiple)
     datings__period = forms.ChoiceField(label=_(u"Period"), choices=[])
     unit = forms.ChoiceField(label=_(u"Unit type"), choices=[])
     parcel = ParcelField(label=_(u"Parcel (section/number/public domain)"))
@@ -71,6 +74,8 @@ class RecordSelect(TableSelect):
         self.fields['unit'].help_text = models.Unit.get_help()
         self.fields['relation_types'].choices = models.RelationType.get_types(
             empty_first=False)
+        self.fields['ope_relation_types'].choices = OpeRelationType.get_types(
+            empty_first=False)
 
     def get_input_ids(self):
         ids = super(RecordSelect, self).get_input_ids()
@@ -81,6 +86,9 @@ class RecordSelect(TableSelect):
         ids.pop(ids.index('relation_types'))
         for idx, c in enumerate(self.fields['relation_types'].choices):
             ids.append('relation_types_{}'.format(idx))
+        ids.pop(ids.index('ope_relation_types'))
+        for idx, c in enumerate(self.fields['ope_relation_types'].choices):
+            ids.append('ope_relation_types_{}'.format(idx))
         return ids