diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-17 13:52:44 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-17 13:53:44 +0200 |
| commit | c3bb366cb00fd1eaf7d1487a7c8e46b14659d081 (patch) | |
| tree | 8c0b91b41ceb45dcfc72bb3ac8d55bc1b945089c /archaeological_files | |
| parent | 6f78867c8dfa8adb58f8d072d71ee8e52dd660fa (diff) | |
| download | Ishtar-c3bb366cb00fd1eaf7d1487a7c8e46b14659d081.tar.bz2 Ishtar-c3bb366cb00fd1eaf7d1487a7c8e46b14659d081.zip | |
Parcels: add public domain field - better management of parcel formsets (refs #2284)
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_files/views.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 86f21f263..41381e0b8 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -53,7 +53,7 @@ class FileSelect(TableSelect): internal_reference = forms.CharField(max_length=200, label=_("Other reference")) towns = get_town_field() - parcel = ParcelField(label=_("Parcel (section/number)")) + parcel = ParcelField(label=_("Parcel (section/number/public domain)")) if settings.ISHTAR_DPTS: towns__numero_insee__startswith = forms.ChoiceField( label=_(u"Department"), choices=[]) @@ -119,6 +119,7 @@ class FileSelect(TableSelect): ids.pop(ids.index('parcel')) ids.append('parcel_0') ids.append('parcel_1') + ids.append('parcel_2') return ids @@ -426,7 +427,7 @@ class AdministrativeActFileSelect(TableSelect): act_type = forms.ChoiceField(label=_("Act type"), choices=[]) indexed = forms.NullBooleanField(label=_(u"Indexed?")) associated_file__towns = get_town_field() - parcel = ParcelField(label=_("Parcel (section/number)")) + parcel = ParcelField(label=_("Parcel (section/number/public domain)")) if settings.ISHTAR_DPTS: associated_file__towns__numero_insee__startswith = forms.ChoiceField( label=_(u"Department"), choices=[]) @@ -503,6 +504,7 @@ class AdministrativeActFileSelect(TableSelect): ids.pop(ids.index('parcel')) ids.append('parcel_0') ids.append('parcel_1') + ids.append('parcel_2') return ids diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 5eed99278..3341c2813 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -85,6 +85,8 @@ get_file = get_item( 'operations__parcels__section'), 'parcel_1': ('parcels__parcel_number', 'operations__parcels__parcel_number'), + 'parcel_2': ('operations__parcels__public_domain', + 'parcels__public_domain'), 'end_date': 'end_date__isnull', 'towns__numero_insee__startswith': 'towns__numero_insee__startswith', @@ -135,6 +137,8 @@ get_administrativeactfile = get_item( 'parcel_1': ( 'operation__parcels__parcel_number', 'associated_file__parcels__parcel_number'), + 'parcel_2': ('operations__parcels__public_domain', + 'associated_file__parcels__public_domain'), 'associated_file__permit_reference': 'associated_file__permit_reference__icontains'}, reversed_bool_fields=['index__isnull'], |