From a302c294354e8281d4180aad4cd541a9da9e45b5 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 19 Dec 2013 19:55:31 +0100 Subject: Improve file and admin act (file) searches (refs #1533) --- archaeological_files/views.py | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'archaeological_files/views.py') diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 9a866c311..ae4c70f61 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -66,13 +66,16 @@ def autocomplete_file(request): get_file = get_item(models.File, 'get_file', 'file', bool_fields = ['end_date__isnull'], - extra_request_keys={'parcel_0':('parcels__section', - 'operations__parcels__section'), - 'parcel_1':('parcels__parcel_number', - 'operations__parcels__parcel_number'), - 'end_date':'end_date__isnull', - }, - ) + associated_models = [(Person, 'associated_file__general_contractor')], + extra_request_keys={ + 'parcel_0':('parcels__section', + 'operations__parcels__section'), + 'parcel_1':('parcels__parcel_number', + 'operations__parcels__parcel_number'), + 'end_date':'end_date__isnull', + 'name':'name__icontains', + 'permit_reference':'permit_reference__icontains' + },) show_file = show_item(models.File, 'file') revert_file = revert_item(models.File) @@ -81,12 +84,16 @@ get_administrativeactfile = get_item(AdministrativeAct, associated_models = [(models.File, 'associated_file'), (Person, 'associated_file__general_contractor')], dated_fields = ['signature_date__lte', 'signature_date__gte'], - extra_request_keys={'associated_file__towns':'associated_file__towns__pk', - 'operation__towns':'operation__towns__pk', - 'act_type__intented_to':'act_type__intented_to', - 'signature_date_before':'signature_date__lte', - 'signature_date_after':'signature_date__gte', - }) + extra_request_keys={ + 'associated_file__towns':'associated_file__towns__pk', + 'operation__towns':'operation__towns__pk', + 'act_type__intented_to':'act_type__intented_to', + 'signature_date_before':'signature_date__lte', + 'signature_date_after':'signature_date__gte', + 'associated_file__name':'associated_file__name__icontains', + 'associated_file__permit_reference':\ + 'associated_file__permit_reference__icontains' + }) def dashboard_file(request, *args, **kwargs): """ -- cgit v1.2.3