diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-05-11 17:33:47 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-12 08:44:34 +0200 |
| commit | cb2bdf1cf1ee85ddf68e93c29611024571961c5d (patch) | |
| tree | 9730565001c023b38104b04fafad2ec1ff183373 /archaeological_finds/views.py | |
| parent | 481279913a62416ce038b8eb82ad16b581fee7cf (diff) | |
| download | Ishtar-cb2bdf1cf1ee85ddf68e93c29611024571961c5d.tar.bz2 Ishtar-cb2bdf1cf1ee85ddf68e93c29611024571961c5d.zip | |
Adapt forms and wizards to manage M2M images (refs #4076)
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index a2b497c9a..99b2968f3 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -106,6 +106,7 @@ def autocomplete_treatmentfile(request): for file in files]) return HttpResponse(data, content_type='text/plain') + show_findsource = show_item(models.FindSource, 'findsource') get_findsource = get_item(models.FindSource, 'get_findsource', 'findsource') @@ -133,6 +134,7 @@ def check_not_warehouse_module(self): find_creation_steps = [ ('selecrecord-find_creation', RecordFormSelectionTable), ('find-find_creation', FindForm), + ('images-find_creation', ImagesFormset), ('preservation-find_creation', PreservationForm), ('dating-find_creation', DatingFormSet), ('final-find_creation', FinalForm) @@ -167,17 +169,23 @@ find_modification_condition_dict = { 'preservation-find_modification': check_preservation_module, } -find_modification_wizard = FindModificationWizard.as_view([ +find_modification_steps = [ ('selec-find_modification', FindFormSelection), ('selecw-find_modification', FindFormSelectionWarehouseModule), ('selecrecord-find_modification', RecordFormSelection), ('find-find_modification', FindForm), + ('images-find_modification', ImagesFormset), ('preservation-find_modification', PreservationForm), ('dating-find_modification', DatingFormSet), - ('final-find_modification', FinalForm)], + ('final-find_modification', FinalForm) +] + +find_modification_wizard = FindModificationWizard.as_view( + find_modification_steps, condition_dict=find_modification_condition_dict, label=_(u"Find modification"), - url_name='find_modification',) + url_name='find_modification' +) def find_modify(request, pk): @@ -406,9 +414,12 @@ treatment_wizard_steps = [ ('basetreatment-treatment_creation', BaseTreatmentForm), ('selecfind-treatment_creation', UpstreamFindFormSelection), ('selecbasket-treatment_creation', SelectFindBasketForm), + ('images-treatment_creation', TreatmentImagesFormset), # ('resultfind-treatment_creation', ResultFindForm), # ('resultfinds-treatment_creation', ResultFindFormSet), - ('final-treatment_creation', FinalForm)] + ('final-treatment_creation', FinalForm) +] + treatment_search_wizard = SearchWizard.as_view([ ('general-treatment_search', TreatmentFormSelection)], @@ -440,6 +451,7 @@ treatment_modification_wizard = TreatmentModificationWizard.as_view( [('selec-treatment_modification', TreatmentFormSelection), ('file-treatment_modification', TreatmentFormFileChoice), ('basetreatment-treatment_modification', TreatmentModifyForm), + ('images-treatment_creation', TreatmentImagesFormset), ('final-treatment_modification', FinalForm)], label=_(u"Treatment modification"), url_name='treatment_modification', |