diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /archaeological_files/views.py | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 4 |
1 files changed, 4 insertions, 0 deletions
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'], |