Merge branch 'master' into v0.9

1 files changed, 7 insertions, 98 deletions

diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index ae82e9e89..18d57e617 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -136,112 +136,21 @@ def get_available_operation_code(request, year=None):
                        models.Operation.get_available_operation_code(year)})
     return HttpResponse(data, mimetype='text/plain')
 
-get_operation = get_item(
-    models.Operation, 'get_operation', 'operation',
-    bool_fields=['end_date__isnull', 'virtual_operation',
-                 'documentation_received', 'finds_received'],
-    dated_fields=['start_date__lte', 'start_date__gte',
-                  'excavation_end_date__lte', 'excavation_end_date__gte',
-                  'documentation_deadline__lte', 'documentation_deadline__gte',
-                  'finds_deadline__lte', 'finds_deadline__gte',
-                  ],
-    relative_session_names=[('file', 'associated_file__pk')],
-    extra_request_keys={
-        'common_name': 'common_name__icontains',
-        'cached_label': 'cached_label__icontains',
-        'comment': 'comment__icontains',
-        'scientific_documentation_comment':
-        'scientific_documentation_comment__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': (
-            'parcels__parcel_number',
-            'associated_file__parcels__parcel_number'),
-        'parcel_2': (
-            'parcels__public_domain',
-            'associated_file__parcels__public_domain'),
-        'history_creator':
-        'history_creator__ishtaruser__person__pk',
-        'history_modifier':
-        'history_modifier__ishtaruser__person__pk',
-        'archaeological_sites':
-        'archaeological_sites__pk',
-        'documentation_deadline_before': 'documentation_deadline__lte',
-        'documentation_deadline_after': 'documentation_deadline__gte',
-        'finds_deadline_before': 'finds_deadline__lte',
-        'finds_deadline_after': 'finds_deadline__gte',
-    },
-)
+get_operation = get_item(models.Operation, 'get_operation', 'operation')
+
 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={
-        'title': 'title__icontains',
-        'description': 'description__icontains',
-        'comment': 'comment__icontains',
-        'additional_information': 'additional_information__icontains',
-        'person': 'authors__person__pk',
-        'operation__towns': 'operation__towns__pk',
-        'operation__operation_code': 'operation__operation_code',
-        'operation__code_patriarche': 'operation__code_patriarche',
-        'operation__operation_type': 'operation__operation_type__pk',
-        'operation__year': 'operation__year'})
+get_operationsource = get_item(models.OperationSource, 'get_operationsource',
+                               'operationsource')
 
 get_administrativeactop = get_item(
-    models.AdministrativeAct,
-    'get_administrativeactop', 'administrativeactop',
-    extra_request_keys={
-        'associated_file__towns': 'associated_file__towns__pk',
-        'operation__towns': 'operation__towns__pk',
-        'operation__code_patriarche': 'operation__code_patriarche',
-        'act_type__intented_to': 'act_type__intented_to',
-        'year': 'signature_date__year',
-        'act_object': 'act_object__icontains',
-        'history_creator':
-        'history_creator__ishtaruser__person__pk',
-        'history_modifier':
-        'history_modifier__ishtaruser__person__pk',
-        'operation__towns__numero_insee__startswith':
-        'operation__towns__numero_insee__startswith',
-        'indexed': 'index__isnull',
-        'parcel_0': ('operation__parcels__section',
-                     'operation__associated_file__parcels__section'),
-        'parcel_1': (
-            'operation__parcels__parcel_number',
-            'operation__associated_file__parcels__parcel_number'),
-        'parcel_2': (
-            'operation__parcels__public_domain',
-            'operation__associated_file__parcels__public_domain'),
-    },
-    reversed_bool_fields=['index__isnull'],
-    relative_session_names=[('operation', 'operation__pk')])
+    models.AdministrativeAct, 'get_administrativeactop', 'administrativeactop')
 
 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',
-                        'act_object': 'act_object__icontains',
-                        'operation__towns__numero_insee__startswith':
-                        'operation__towns__numero_insee__startswith',
-                        'operation__towns': 'operation__towns__pk'},
-    reversed_bool_fields=['index__isnull'],)
+    models.AdministrativeAct, 'get_administrativeact', 'administrativeact')
+
 show_administrativeact = show_item(models.AdministrativeAct,
                                    'administrativeact')