summaryrefslogtreecommitdiff
path: root/archaeological_finds/forms.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_finds/forms.py')
-rw-r--r--archaeological_finds/forms.py22
1 files changed, 14 insertions, 8 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 5614118ec..44d883b0f 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -28,7 +28,6 @@ from django.conf import settings
from django.core import validators
from django.core.exceptions import PermissionDenied
from django.forms.formsets import formset_factory
-from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from ishtar_common.models import valid_id, valid_ids, get_current_profile, \
@@ -44,7 +43,7 @@ from ishtar_common.forms import FormSet, FloatField, \
ManageOldType, FieldType, IshtarForm, FormHeader
from ishtar_common.forms_common import get_town_field, \
- get_image_help, SourceSelect, CustomForm
+ SourceSelect, CustomForm, BaseImageForm, BaseImageFormset
from ishtar_common.utils import convert_coordinates_to_point
from ishtar_common import widgets
from bootstrap_datepicker.widgets import DatePicker
@@ -64,7 +63,7 @@ from archaeological_finds.forms_treatments import TreatmentSelect, \
AdministrativeActTreatmentFileModifForm, SourceTreatmentFormSelection, \
SourceTreatmentFileFormSelection, TreatmentSourceFormSelection, \
TreatmentFileSourceFormSelection, DashboardForm as DashboardTreatmentForm, \
- DashboardTreatmentFileForm
+ DashboardTreatmentFileForm, TreatmentImagesFormset
__all__ = [
'TreatmentSelect', 'TreatmentFormSelection', 'BaseTreatmentForm',
@@ -81,7 +80,7 @@ __all__ = [
'TreatmentFileSourceFormSelection', 'DashboardTreatmentForm',
'DashboardTreatmentFileForm',
'RecordFormSelection', 'FindForm', 'DateForm', 'DatingFormSet',
- 'PreservationForm',
+ 'PreservationForm', 'ImagesFormset',
'FindSelect', 'FindFormSelection', 'FindFormSelectionWarehouseModule',
'MultipleFindFormSelection', 'MultipleFindFormSelectionWarehouseModule',
'FindMultipleFormSelection', 'check_form', 'check_exist', 'check_not_exist',
@@ -89,7 +88,9 @@ __all__ = [
'check_treatment', 'ResultFindForm', 'ResultFindFormSet',
'FindDeletionForm', 'UpstreamFindFormSelection', 'SourceFindFormSelection',
'FindSourceSelect', 'FindSourceFormSelection', 'NewFindBasketForm',
- 'SelectFindBasketForm', 'DeleteFindBasketForm', 'FindBasketAddItemForm']
+ 'SelectFindBasketForm', 'DeleteFindBasketForm', 'FindBasketAddItemForm',
+ 'TreatmentImagesFormset'
+]
logger = logging.getLogger(__name__)
@@ -194,9 +195,6 @@ class FindForm(CustomForm, ManageOldType):
communicabilitie = widgets.Select2MultipleField(
label=_(u"Communicability"), required=False
)
- image = forms.ImageField(
- label=_(u"Image"), help_text=mark_safe(get_image_help()),
- max_length=255, required=False, widget=widgets.ImageFileInput())
comment = forms.CharField(label=_(u"Comment"), required=False,
widget=forms.Textarea)
dating_comment = forms.CharField(
@@ -326,6 +324,14 @@ class FindForm(CustomForm, ManageOldType):
return self.cleaned_data
+ImagesFormset = formset_factory(BaseImageForm, can_delete=True,
+ formset=BaseImageFormset)
+ImagesFormset.file_upload = True
+ImagesFormset.form_label = _(u"Images")
+ImagesFormset.form_admin_name = _(u"Find - 025 - Images")
+ImagesFormset.form_slug = "find-025-images"
+
+
class PreservationForm(CustomForm, ManageOldType):
form_label = _("Preservation")
form_admin_name = _(u"Find - 030 - Preservation")