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 | 7c9a9d586e5255b60179807934e780b3d38cd30e (patch) | |
| tree | 9730565001c023b38104b04fafad2ec1ff183373 /archaeological_operations | |
| parent | 11e557cc8a28628ae777415fa5c04196c555e749 (diff) | |
| download | Ishtar-7c9a9d586e5255b60179807934e780b3d38cd30e.tar.bz2 Ishtar-7c9a9d586e5255b60179807934e780b3d38cd30e.zip | |
Adapt forms and wizards to manage M2M images (refs #4076)
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/forms.py | 13 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index b6304d14d..ea0db0908 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -52,7 +52,7 @@ from ishtar_common.forms import FinalForm, FormSet, get_now, \ reverse_lazy, get_form_selection, TableSelect, get_data_from_formset, \ ManageOldType, IshtarForm, CustomForm, FieldType, FormSetWithDeleteSwitches from ishtar_common.forms_common import TownFormSet, SourceForm, SourceSelect, \ - get_town_field, TownForm, get_image_help, BaseImageForm, BaseImageFormset + get_town_field, TownForm, BaseImageForm, BaseImageFormset from archaeological_operations.utils import parse_parcels @@ -871,9 +871,6 @@ class OperationFormGeneral(CustomForm, ManageOldType): required=False) virtual_operation = forms.BooleanField(required=False, label=_(u"Virtual operation")) - image = forms.ImageField( - label=_(u"Image"), help_text=mark_safe(get_image_help()), - max_length=255, required=False, widget=widgets.ImageFileInput()) FILE_FIELDS = [ 'report_delivery_date', @@ -1351,6 +1348,14 @@ SiteTownFormset.form_admin_name = _(u"Archaeological site - 020 - Towns") SiteTownFormset.form_slug = u"archaeological_site-020-towns" +SiteImagesFormset = formset_factory(BaseImageForm, can_delete=True, + formset=BaseImageFormset) +SiteImagesFormset.file_upload = True +SiteImagesFormset.form_label = _(u"Images") +SiteImagesFormset.form_admin_name = _(u"Archaeological site - 025 - Images") +SiteImagesFormset.form_slug = "archaeological_site-025-images" + + def check_underwater_module(self): return get_current_profile().underwater diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 7a74ce58a..ea863bb36 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -45,7 +45,7 @@ from archaeological_operations.forms import ArchaeologicalSiteForm, \ AdministrativeActOpeModifForm, FinalAdministrativeActDeleteForm, \ AdministrativeActRegisterFormSelection, DocumentGenerationAdminActForm, \ SiteForm, SiteTownFormset, SiteUnderwaterForm, check_underwater_module, \ - CourtOrderedSeizureForm, ImagesFormset + CourtOrderedSeizureForm, ImagesFormset, SiteImagesFormset from ishtar_common.views import get_item, show_item, revert_item, new_item @@ -373,6 +373,7 @@ site_search_wizard = SiteSearch.as_view( site_creation_steps = [ ('general-site_creation', SiteForm), ('towns-site_creation', SiteTownFormset), + ('images-site_creation', SiteImagesFormset), ('underwater-site_creation', SiteUnderwaterForm), ('final-site_creation', FinalForm) ] @@ -387,6 +388,7 @@ site_modification_steps = [ ('selec-site_modification', SiteFormSelection), ('general-site_modification', SiteForm), ('towns-site_modification', SiteTownFormset), + ('images-site_modification', SiteImagesFormset), ('underwater-site_modification', SiteUnderwaterForm), ('final-site_modification', FinalForm) ] |