diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-04 00:52:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-04 00:52:07 +0100 |
| commit | 969eda7b6d5d8eafffab1279a223f9172f403837 (patch) | |
| tree | 70048ed62d8f8aec7e68867dc595a628c3d6c075 /archaeological_files/views.py | |
| parent | dee287f34dab74c184273f936b08b53d54d24893 (diff) | |
| parent | b0a48f170a51b7239960aadcc501e23b9af339c2 (diff) | |
| download | Ishtar-969eda7b6d5d8eafffab1279a223f9172f403837.tar.bz2 Ishtar-969eda7b6d5d8eafffab1279a223f9172f403837.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index e31cd00b8..5eed99278 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -89,10 +89,12 @@ get_file = get_item( 'towns__numero_insee__startswith': 'towns__numero_insee__startswith', 'name': 'name__icontains', + 'comment': 'comment__icontains', 'permit_reference': 'permit_reference__icontains', 'general_contractor__attached_to': 'general_contractor__attached_to__pk', 'history_creator': 'history_creator__ishtaruser__person__pk', + 'history_modifier': 'history_modifier__ishtaruser__person__pk', },) revert_file = revert_item(models.File) @@ -116,7 +118,8 @@ get_administrativeactfile = get_item( 'year': 'signature_date__year', 'associated_file__towns': 'associated_file__towns__pk', 'history_creator': 'history_creator__ishtaruser__person__pk', - 'operation__towns': 'operation__towns__pk', + 'associated_file__operations__code_patriarche': + 'associated_file__operations__code_patriarche', 'act_type__intented_to': 'act_type__intented_to', 'act_object': 'act_object__icontains', 'signature_date_before': 'signature_date__lte', @@ -124,10 +127,18 @@ get_administrativeactfile = get_item( 'associated_file__general_contractor__attached_to': 'associated_file__general_contractor__attached_to__pk', 'associated_file__name': 'associated_file__name__icontains', - 'operation__towns__numero_insee__startswith': - 'operation__towns__numero_insee__startswith', + 'associated_file__towns__numero_insee__startswith': + 'associated_file__towns__numero_insee__startswith', + 'indexed': 'index__isnull', + 'parcel_0': ('operation__parcels__section', + 'associated_file__parcels__section'), + 'parcel_1': ( + 'operation__parcels__parcel_number', + 'associated_file__parcels__parcel_number'), 'associated_file__permit_reference': 'associated_file__permit_reference__icontains'}, + reversed_bool_fields=['index__isnull'], + base_request={"associated_file__pk__isnull": False}, relative_session_names={'file': 'associated_file__pk'}) |