summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-05-10 19:51:10 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-05-10 19:51:10 +0200
commitff3e594b6ba7c0130c676c16ed642399cec312cd (patch)
tree89270ed12fac165ff8819e5d2ee7efaa161f9dad
parent9efeba22bcdf2270496fb8d305ac07a9abf3a2c1 (diff)
downloadIshtar-ff3e594b6ba7c0130c676c16ed642399cec312cd.tar.bz2
Ishtar-ff3e594b6ba7c0130c676c16ed642399cec312cd.zip
Context records search: fix relation searches
-rw-r--r--archaeological_context_records/forms.py12
-rw-r--r--archaeological_context_records/tests.py2
2 files changed, 7 insertions, 7 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index b3e9a04c0..91effb397 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -77,7 +77,7 @@ class RecordSelect(TableSelect):
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)"))
- relation_types = forms.MultipleChoiceField(
+ cr_relation_types = forms.MultipleChoiceField(
label=_(u"Search within relations"), choices=[],
widget=forms.CheckboxSelectMultiple)
@@ -87,8 +87,8 @@ class RecordSelect(TableSelect):
self.fields['datings__period'].help_text = Period.get_help()
self.fields['unit'].choices = models.Unit.get_types()
self.fields['unit'].help_text = models.Unit.get_help()
- self.fields['relation_types'].choices = models.RelationType.get_types(
- empty_first=False)
+ self.fields['cr_relation_types'].choices = \
+ models.RelationType.get_types(empty_first=False)
self.fields['ope_relation_types'].choices = OpeRelationType.get_types(
empty_first=False)
@@ -98,9 +98,9 @@ class RecordSelect(TableSelect):
ids.append('parcel_0')
ids.append('parcel_1')
ids.append('parcel_2')
- 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('cr_relation_types'))
+ for idx, c in enumerate(self.fields['cr_relation_types'].choices):
+ ids.append('cr_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))
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index e697459b5..df05f4898 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -369,7 +369,7 @@ class ContextRecordSearchTest(ContextRecordInit, TestCase):
# test search between relations
response = c.get(reverse('get-contextrecord'),
{'label': 'cr 1',
- 'relation_types_0': self.cr_rel_type.pk})
+ 'cr_relation_types_0': self.cr_rel_type.pk})
self.assertEqual(json.loads(response.content)['total'], 2)
# test search between related operations
first_ope = self.operations[0]