diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-04-26 13:27:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-12 08:43:58 +0200 |
| commit | 2d7c3989368998b94298eac7ce1192559d9993f3 (patch) | |
| tree | 30d1c62ee5785aa534e8eedc54f2682b34fadc3e /archaeological_operations | |
| parent | c6f7e868e9fa1eb51381c064c930b73b566ff758 (diff) | |
| download | Ishtar-2d7c3989368998b94298eac7ce1192559d9993f3.tar.bz2 Ishtar-2d7c3989368998b94298eac7ce1192559d9993f3.zip | |
Operations: add ishtar images panel (refs #4076)
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/forms.py | 12 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 2309a4f4a..c780fdcd7 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -50,9 +50,9 @@ from ishtar_common import widgets from ishtar_common.forms import FinalForm, FormSet, get_now, \ reverse_lazy, get_form_selection, TableSelect, get_data_from_formset, \ - ManageOldType, IshtarForm, CustomForm, FieldType + ManageOldType, IshtarForm, CustomForm, FieldType, FormSetWithDeleteSwitches from ishtar_common.forms_common import TownFormSet, SourceForm, SourceSelect, \ - get_town_field, TownForm, get_image_help + get_town_field, TownForm, get_image_help, BaseImageForm from archaeological_operations.utils import parse_parcels @@ -1025,6 +1025,14 @@ class CollaboratorForm(CustomForm, IshtarForm): self.fields['collaborator'].widget.attrs['full-width'] = True +ImagesFormset = formset_factory(BaseImageForm, can_delete=True, + formset=FormSet) +ImagesFormset.file_upload = True +ImagesFormset.form_label = _(u"Images") +ImagesFormset.form_admin_name = _(u"Operation - 025 - Images") +ImagesFormset.form_slug = "operation-025-images" + + class OperationFormPreventive(CustomForm, IshtarForm): form_label = _(u"Preventive informations - excavation") form_admin_name = _(u"Operation - 033 - Preventive - Excavation") diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index e7e624c05..7a74ce58a 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 + CourtOrderedSeizureForm, ImagesFormset from ishtar_common.views import get_item, show_item, revert_item, new_item @@ -197,6 +197,7 @@ wizard_steps = [ ('general-operation_creation', OperationFormGeneral), ('judiciary-operation_creation', CourtOrderedSeizureForm), ('collaborators-operation_creation', CollaboratorForm), + ('images-operation_creation', ImagesFormset), ('archaeologicalsite-operation_creation', ArchaeologicalSiteFormSet), ('preventive-operation_creation', OperationFormPreventive), ('preventivediag-operation_creation', OperationFormPreventiveDiag), @@ -259,6 +260,7 @@ operation_modif_wizard_steps = [ ('general-operation_modification', OperationFormModifGeneral), ('judiciary-operation_modification', CourtOrderedSeizureForm), ('collaborators-operation_modification', CollaboratorForm), + ('images-operation_modification', ImagesFormset), ('archaeologicalsite-operation_modification', ArchaeologicalSiteFormSet), ('preventive-operation_modification', OperationFormPreventive), ('preventivediag-operation_modification', OperationFormPreventiveDiag), |