summaryrefslogtreecommitdiff
path: root/archaeological_operations/views.py
diff options
context:
space:
mode:
authorroot <root@viserion.(none)>2013-04-16 21:53:17 +0000
committerroot <root@viserion.(none)>2013-04-16 21:53:17 +0000
commit1ccc928d7eeaed8f38d00c764d524f2fd3db8c57 (patch)
tree18e9460122640484df04be868a1d422fe4ddffe3 /archaeological_operations/views.py
parent1017060f8673ecc9febb7c8debbf6b9193ead9a1 (diff)
parentd989ccd4646601e6ae482dbbc2b4edc0db46481c (diff)
downloadIshtar-1ccc928d7eeaed8f38d00c764d524f2fd3db8c57.tar.bz2
Ishtar-1ccc928d7eeaed8f38d00c764d524f2fd3db8c57.zip
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_operations/views.py')
-rw-r--r--archaeological_operations/views.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 1ce4c4622..e5bf16ce8 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -103,8 +103,10 @@ get_operation = get_item(models.Operation, 'get_operation', 'operation',
'start_after':'start_date__gte',
'end_before':'excavation_end_date__lte',
'end_after':'excavation_end_date__gte',
- 'parcel_0':'parcels__section',
- 'parcel_1':'parcels__parcel_number',
+ 'parcel_0':('parcels__section',
+ 'associated_file__parcels__section'),
+ 'parcel_1':('parcels__parcel_number',
+ 'associated_file__parcels__parcel_number'),
},
)
show_operation = show_item(models.Operation, 'operation')