1 files changed, 7 insertions, 76 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index d441559cc..89babe9b7 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -40,81 +40,14 @@ from wizards import *
 from forms import *
 import models
 
-find_extra_keys = {
-    'base_finds__cache_short_id':
-        'base_finds__cache_short_id__icontains',
-    'base_finds__cache_complete_id':
-        'base_finds__cache_complete_id__icontains',
-    'label':
-        'label__icontains',
-    'base_finds__context_record':
-        'base_finds__context_record__pk',
-    'base_finds__context_record__parcel__town':
-        'base_finds__context_record__parcel__town',
-    'base_finds__context_record__operation__year':
-        'base_finds__context_record__operation__year__contains',
-    'base_finds__context_record__operation':
-        'base_finds__context_record__operation__pk',
-    'archaeological_sites':
-        'base_finds__context_record__operation__archaeological_sites__pk',
-    'base_finds__context_record__operation__code_patriarche':
-        'base_finds__context_record__operation__code_patriarche',
-    'datings__period': 'datings__period__pk',
-    'base_finds__find__description':
-        'base_finds__find__description__icontains',
-    'base_finds__batch': 'base_finds__batch',
-    'basket': 'basket',
-    'cached_label': 'cached_label__icontains',
-    'image': 'image__isnull'}
-
-get_find = get_item(
-    models.Find, 'get_find', 'find',
-    reversed_bool_fields=['image__isnull'],
-    relation_types_prefix={
-        'ope_relation_types':
-        'base_finds__context_record__operation__'},
-    relative_session_names=[
-        ('contextrecord', 'base_finds__context_record__pk'),
-        ('operation', 'base_finds__context_record__operation__pk'),
-        ('file', 'base_finds__context_record__operation__associated_file__pk')
-    ],
-    base_request={'downstream_treatment__isnull': True},
-    extra_request_keys=find_extra_keys.copy())
-
-get_find_for_ope = get_item(
-    models.Find, 'get_find', 'find',
-    reversed_bool_fields=['image__isnull'],
-    base_request={'downstream_treatment__isnull': True},
-    extra_request_keys=find_extra_keys.copy(),
-    own_table_cols=models.Find.TABLE_COLS_FOR_OPE)
+get_find = get_item(models.Find, 'get_find', 'find')
+
+get_find_for_ope = get_item(models.Find, 'get_find', 'find',
+                            own_table_cols=models.Find.TABLE_COLS_FOR_OPE)
 
 show_findsource = show_item(models.FindSource, 'findsource')
 
-get_findsource = get_item(
-    models.FindSource, 'get_findsource', 'findsource',
-    bool_fields=['duplicate'],
-    relative_session_names=[
-        ('find', 'find__pk'),
-        ('contextrecord', 'find__base_finds__context_record__pk'),
-        ('operation', 'find__base_finds__context_record__operation__pk'),
-        ('file',
-         'find__base_finds__context_record__operation__associated_file__pk')
-    ],
-    extra_request_keys={
-        'title': 'title__icontains',
-        'description': 'description__icontains',
-        'comment': 'comment__icontains',
-        'additional_information': 'additional_information__icontains',
-        'person': 'authors__person__pk',
-        'find__base_finds__context_record__operation__year':
-        'find__base_finds__context_record__operation__year',
-        'find__base_finds__context_record__operation__operation_code':
-        'find__base_finds__context_record__operation__operation_code',
-        'find__base_finds__context_record__operation__code_patriarche':
-        'find__base_finds__context_record__operation__code_patriarche',
-        'find__datings__period': 'find__datings__period__pk',
-        'find__description': 'find__description__icontains',
-    })
+get_findsource = get_item(models.FindSource, 'get_findsource', 'findsource')
 show_find = show_item(models.Find, 'find')
 revert_find = revert_item(models.Find)
 
@@ -343,13 +276,11 @@ class DeleteFindBasketView(IshtarMixin, LoginRequiredMixin, FormView):
         return HttpResponseRedirect(self.get_success_url())
 
 get_upstreamtreatment = get_item(
-    models.FindUpstreamTreatments, 'get_upstreamtreatment', 'uptreatment',
-    extra_request_keys={'find_id': 'find_id'})
+    models.FindUpstreamTreatments, 'get_upstreamtreatment', 'uptreatment')
 
 get_downstreamtreatment = get_item(
     models.FindDownstreamTreatments, 'get_downstreamtreatment',
-    'downtreatment',
-    extra_request_keys={'find_id': 'find_id'})
+    'downtreatment')
 
 treatment_creation_wizard = TreatmentWizard.as_view([
     ('basetreatment-treatment_creation', BaseTreatmentForm),