diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
| commit | 11d7e76203e13a6d4c2a0c9aa29bd2d1dd86f5b6 (patch) | |
| tree | 8d8e7c09faf179b2fed07878d1cf450a245a78d0 /archaeological_operations/views.py | |
| parent | 19fcd922361b045894c0eeb56e095d785299909e (diff) | |
| parent | 2c063aace94e5a9f3b5dc596e4a502ef062db059 (diff) | |
| download | Ishtar-11d7e76203e13a6d4c2a0c9aa29bd2d1dd86f5b6.tar.bz2 Ishtar-11d7e76203e13a6d4c2a0c9aa29bd2d1dd86f5b6.zip | |
Merge branch 'master' into master-land-planner-2999
Diffstat (limited to 'archaeological_operations/views.py')
| -rw-r--r-- | archaeological_operations/views.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index d3d50d791..256985f50 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -151,9 +151,11 @@ get_operation = get_item( show_operation = show_item(models.Operation, 'operation') revert_operation = revert_item(models.Operation) +show_operationsource = show_item(models.OperationSource, 'operationsource') get_operationsource = get_item( models.OperationSource, 'get_operationsource', 'operationsource', + bool_fields=['duplicate'], extra_request_keys={ 'operation__towns': 'operation__towns__pk', 'operation__operation_type': 'operation__operation_type__pk', @@ -166,6 +168,7 @@ get_administrativeactop = get_item( 'operation__towns': 'operation__towns__pk', 'act_type__intented_to': 'act_type__intented_to', 'year': 'signature_date__year', + 'act_object': 'act_object__icontains', 'history_creator': 'history_creator__ishtaruser__person__pk', 'operation__towns__numero_insee__startswith': @@ -180,6 +183,7 @@ get_administrativeact = get_item( 'indexed': 'index__isnull', 'history_creator': 'history_creator__ishtaruser__person__pk', + 'act_object': 'act_object__icontains', 'operation__towns__numero_insee__startswith': 'operation__towns__numero_insee__startswith', 'operation__towns': 'operation__towns__pk'}, @@ -211,6 +215,7 @@ wizard_steps = [ ('parcels-operation_creation', SelectedParcelFormSet), ('remains-operation_creation', RemainForm), ('periods-operation_creation', PeriodForm), + ('relations-operation_creation', RecordRelationsFormSet), ('final-operation_creation', FinalForm)] if FILES_AVAILABLE: wizard_steps.insert(0, ('filechoice-operation_creation', @@ -250,6 +255,7 @@ operation_modification_wizard = OperationModificationWizard.as_view([ ('parcelsgeneral-operation_modification', SelectedParcelGeneralFormSet), ('remains-operation_modification', RemainForm), ('periods-operation_modification', PeriodForm), + ('relations-operation_modification', RecordRelationsFormSet), ('final-operation_modification', FinalForm)], label=_(u"Operation modification"), condition_dict={ |