diff options
Diffstat (limited to 'archaeological_operations/views.py')
| -rw-r--r-- | archaeological_operations/views.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index a10f63e88..9482f44b4 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -133,12 +133,15 @@ get_operation = get_item( dated_fields=['start_date__lte', 'start_date__gte', 'excavation_end_date__lte', 'excavation_end_date__gte'], extra_request_keys={'common_name': 'common_name__icontains', + 'abstract': 'abstract__icontains', 'end_date': 'end_date__isnull', 'year_index': ('year', 'operation_code'), 'start_before': 'start_date__lte', 'start_after': 'start_date__gte', 'end_before': 'excavation_end_date__lte', 'end_after': 'excavation_end_date__gte', + 'towns__numero_insee__startswith': + 'towns__numero_insee__startswith', 'parcel_0': ('parcels__section', 'associated_file__parcels__section'), 'parcel_1': ( @@ -146,6 +149,8 @@ get_operation = get_item( 'associated_file__parcels__parcel_number'), 'history_creator': 'history_creator__ishtaruser__person__pk', + 'archaeological_sites': + 'archaeological_sites__pk', }, ) show_operation = show_item(models.Operation, 'operation') @@ -157,6 +162,10 @@ get_operationsource = get_item( 'get_operationsource', 'operationsource', bool_fields=['duplicate'], extra_request_keys={ + 'title': 'title__icontains', + 'description': 'description__icontains', + 'comment': 'comment__icontains', + 'additional_information': 'additional_information__icontains', 'operation__towns': 'operation__towns__pk', 'operation__operation_type': 'operation__operation_type__pk', 'operation__year': 'operation__year'}) @@ -216,6 +225,7 @@ wizard_steps = [ ('remains-operation_creation', RemainForm), ('periods-operation_creation', PeriodForm), ('relations-operation_creation', RecordRelationsFormSet), + ('abstract-operation_creation', OperationFormAbstract), ('final-operation_creation', FinalForm)] if FILES_AVAILABLE: wizard_steps.insert(0, ('filechoice-operation_creation', @@ -256,6 +266,7 @@ operation_modification_wizard = OperationModificationWizard.as_view([ ('remains-operation_modification', RemainForm), ('periods-operation_modification', PeriodForm), ('relations-operation_modification', RecordRelationsFormSet), + ('abstract-operation_modification', OperationFormAbstract), ('final-operation_modification', FinalForm)], label=_(u"Operation modification"), condition_dict={ |