summaryrefslogtreecommitdiff
path: root/archaeological_operations/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2013-04-16 21:53:17 +0000
committerÉtienne Loks <etienne.loks@proxience.com>2013-04-16 21:53:17 +0000
commita48d37badc463c1a4e496f9007d29257718a48dc (patch)
tree18e9460122640484df04be868a1d422fe4ddffe3 /archaeological_operations/views.py
parent12ac381ca07632f2454b53fcddec02b1d7427604 (diff)
parent82ecdb8c53d51a68b2a0b8fd35e14069ffd8540d (diff)
downloadIshtar-a48d37badc463c1a4e496f9007d29257718a48dc.tar.bz2
Ishtar-a48d37badc463c1a4e496f9007d29257718a48dc.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')