From c3bb366cb00fd1eaf7d1487a7c8e46b14659d081 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Aug 2016 13:52:44 +0200 Subject: Parcels: add public domain field - better management of parcel formsets (refs #2284) --- archaeological_context_records/forms.py | 3 ++- archaeological_context_records/views.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 9cec6a0e5..7572b0bcb 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -58,7 +58,7 @@ class RecordSelect(TableSelect): validators=[valid_id(ArchaeologicalSite)]) datings__period = forms.ChoiceField(label=_(u"Period"), choices=[]) unit = forms.ChoiceField(label=_(u"Unit type"), choices=[]) - parcel = ParcelField(label=_(u"Parcel (section/number)")) + parcel = ParcelField(label=_(u"Parcel (section/number/public domain)")) relation_types = forms.MultipleChoiceField( label=_(u"Search within relations"), choices=[], widget=forms.CheckboxSelectMultiple) @@ -77,6 +77,7 @@ class RecordSelect(TableSelect): ids.pop(ids.index('parcel')) 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)) diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index e97abe83c..1b8585b82 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -43,6 +43,7 @@ contextrecord_extra_keys = { 'datings__period': 'datings__period__pk', 'parcel_0': 'operation__parcels__section', 'parcel_1': 'operation__parcels__parcel_number', + 'parcel_2': 'operation__parcels__public_domain', 'label': 'label__icontains', 'archaeological_sites': 'operation__archaeological_sites__pk', } -- cgit v1.2.3