diff options
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 8bae9785c..783b336f2 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -69,6 +69,9 @@ find_extra_keys = { 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__'}, base_request={'downstream_treatment__isnull': True}, extra_request_keys=find_extra_keys.copy()) @@ -89,8 +92,13 @@ get_findsource = get_item( 'description': 'description__icontains', 'comment': 'comment__icontains', 'additional_information': 'additional_information__icontains', - 'find__context_record__operation__year': - 'find__context_record__operation__year', + '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', }) @@ -136,6 +144,10 @@ find_deletion_wizard = FindDeletionWizard.as_view([ label=_(u"Find deletion"), url_name='find_deletion',) +find_source_search_wizard = SearchWizard.as_view([ + ('selec-find_source_search', FindSourceFormSelection)], + label=_(u"Find: source search"), + url_name='find_source_search',) find_source_creation_wizard = FindSourceWizard.as_view([ ('selec-find_source_creation', SourceFindFormSelection), @@ -317,6 +329,10 @@ class DeleteFindBasketView(IshtarMixin, LoginRequiredMixin, FormView): form.save() return HttpResponseRedirect(self.get_success_url()) +get_treatment = get_item( + models.FindTreatments, 'get_treatment', 'treatment', + extra_request_keys={'find_id': 'find_id'}) + treatment_creation_wizard = TreatmentWizard.as_view([ ('basetreatment-treatment_creation', BaseTreatmentForm), ('selecfind-treatment_creation', UpstreamFindFormSelection), |