diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-06-15 21:51:19 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-06-15 21:51:19 +0200 |
| commit | e90a37f8c752e5b112e0b699989713223f146afd (patch) | |
| tree | 4890fe917ec9d0a1158e8fafe3be649503947f13 | |
| parent | 925e83d43d47fc527bc2c5ce2354fec3d8a8dd0f (diff) | |
| download | Ishtar-e90a37f8c752e5b112e0b699989713223f146afd.tar.bz2 Ishtar-e90a37f8c752e5b112e0b699989713223f146afd.zip | |
Fix history creator search (refs #1590)
| -rw-r--r-- | archaeological_files/views.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index b57a4cf6b..a7c193843 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -75,7 +75,8 @@ get_file = get_item(models.File, 'get_file', 'file', 'operations__parcels__parcel_number'), 'end_date':'end_date__isnull', 'name':'name__icontains', - 'permit_reference':'permit_reference__icontains' + 'permit_reference':'permit_reference__icontains', + 'history_creator':'history_creator__ishtaruser__person__pk', },) show_file = show_item(models.File, 'file') revert_file = revert_item(models.File) @@ -88,6 +89,7 @@ get_administrativeactfile = get_item(AdministrativeAct, extra_request_keys={ 'year':'signature_date__year', 'associated_file__towns':'associated_file__towns__pk', + 'history_creator':'history_creator__ishtaruser__person__pk', 'operation__towns':'operation__towns__pk', 'act_type__intented_to':'act_type__intented_to', 'signature_date_before':'signature_date__lte', diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 88d82bc3a..6e623db88 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -133,6 +133,8 @@ get_operation = get_item(models.Operation, 'get_operation', 'operation', 'associated_file__parcels__section'), 'parcel_1':('parcels__parcel_number', 'associated_file__parcels__parcel_number'), + 'history_creator':\ + 'history_creator__ishtaruser__person__pk', }, ) show_operation = show_item(models.Operation, 'operation') @@ -150,6 +152,8 @@ get_administrativeactop = get_item(models.AdministrativeAct, 'operation__towns':'operation__towns__pk', 'act_type__intented_to':'act_type__intented_to', 'year':'signature_date__year', + 'history_creator':\ + 'history_creator__ishtaruser__person__pk', }, relative_session_names={'operation':'operation__pk'}) @@ -157,6 +161,8 @@ get_administrativeact = get_item(models.AdministrativeAct, 'get_administrativeact', 'administrativeact', extra_request_keys={'year':'signature_date__year', 'indexed':'index__isnull', + 'history_creator':\ + 'history_creator__ishtaruser__person__pk', 'operation__towns':'operation__towns__pk'}, reversed_bool_fields = ['index__isnull'],) show_administrativeact = show_item(models.AdministrativeAct, |