Adapt forms and wizards to manage M2M images (refs #4076)

1 files changed, 11 insertions, 7 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 481ec3353..fc865ba25 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -26,7 +26,6 @@ from django import forms
 from django.conf import settings
 from django.core import validators
 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, IshtarSiteProfile
@@ -38,10 +37,10 @@ from ishtar_common import widgets
 from bootstrap_datepicker.widgets import DatePicker
 from archaeological_operations.widgets import OAWidget
 from ishtar_common.forms import FinalForm, FormSet, \
-    reverse_lazy, get_form_selection, TableSelect, ManageOldType, CustomForm,\
-    FieldType, IshtarForm
+    reverse_lazy, get_form_selection, TableSelect, ManageOldType, CustomForm, \
+    FieldType
 from ishtar_common.forms_common import get_town_field, SourceSelect, \
-    get_image_help
+    BaseImageForm, BaseImageFormset
 from archaeological_operations.forms import OperationSelect, ParcelField,\
     RecordRelationsForm as OpeRecordRelationsForm, RecordRelationsFormSetBase
 
@@ -182,9 +181,6 @@ class RecordFormGeneral(CustomForm, ManageOldType):
     location = forms.CharField(
         label=_(u"Location"), widget=forms.Textarea,
         required=False, validators=[validators.MaxLengthValidator(200)])
-    image = forms.ImageField(
-        label=_(u"Image"), help_text=mark_safe(get_image_help()),
-        max_length=255, required=False, widget=widgets.ImageFileInput())
 
     TYPES = [
         FieldType('unit', models.Unit),
@@ -267,6 +263,14 @@ class RecordFormGeneral(CustomForm, ManageOldType):
         return 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"Context record - 025 - Images")
+ImagesFormset.form_slug = "contextrecord-025-images"
+
+
 class DatingForm(ManageOldType, forms.Form):
     form_label = _("Dating")
     base_model = 'dating'