Adapt forms, wizards, views, urls for new management of documents (refs #4107)

1 files changed, 7 insertions, 64 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 0d68d6aa3..3238eb771 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -28,21 +28,19 @@ from django.core import validators
 from django.forms.formsets import formset_factory
 from django.utils.translation import ugettext_lazy as _
 
-from ishtar_common.models import valid_id, IshtarSiteProfile, Town
+import models
+from archaeological_operations.forms import OperationSelect, ParcelField, \
+    RecordRelationsForm as OpeRecordRelationsForm, RecordRelationsFormSetBase
 from archaeological_operations.models import Period, Parcel, Operation, \
     ArchaeologicalSite, RelationType as OpeRelationType
-import models
-
-from ishtar_common import widgets
-from bootstrap_datepicker.widgets import DatePicker
 from archaeological_operations.widgets import OAWidget
+from bootstrap_datepicker.widgets import DatePicker
+from ishtar_common import widgets
 from ishtar_common.forms import FinalForm, FormSet, \
     reverse_lazy, get_form_selection, TableSelect, ManageOldType, CustomForm, \
     FieldType
-from ishtar_common.forms_common import get_town_field, SourceSelect, \
-    BaseImageForm, BaseImageFormset, SourceForm
-from archaeological_operations.forms import OperationSelect, ParcelField,\
-    RecordRelationsForm as OpeRecordRelationsForm, RecordRelationsFormSetBase
+from ishtar_common.forms_common import get_town_field
+from ishtar_common.models import valid_id, IshtarSiteProfile, Town
 
 
 class OperationFormSelection(CustomForm, forms.Form):
@@ -282,14 +280,6 @@ 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'
@@ -385,50 +375,3 @@ class RecordDeletionForm(FinalForm):
     confirm_msg = " "
     confirm_end_msg = _(u"Would you like to delete this context record?")
 
-#########################################
-# Source management for context records #
-#########################################
-
-
-SourceRecordFormSelection = get_form_selection(
-    'SourceRecordFormSelection', _(u"Context record search"),
-    'context_record', models.ContextRecord, RecordSelect, 'get-contextrecord',
-    _(u"You should select a context record."))
-
-
-class RecordSourceSelect(SourceSelect):
-    context_record__operation__year = forms.IntegerField(
-        label=_(u"Year of the operation"))
-    context_record__operation__operation_code = forms.IntegerField(
-        label=_(u"Numeric reference"))
-    if settings.COUNTRY == 'fr':
-        context_record__operation__code_patriarche = forms.CharField(
-            max_length=500,
-            widget=OAWidget,
-            label="Code PATRIARCHE")
-    context_record__town = get_town_field(
-        label=_(u"Town"))
-    context_record__datings__period = forms.ChoiceField(
-        label=_(u"Period of the context record"), choices=[])
-    context_record__unit = forms.ChoiceField(
-        label=_(u"Context record type"), choices=[])
-
-    def __init__(self, *args, **kwargs):
-        super(RecordSourceSelect, self).__init__(*args, **kwargs)
-        self.fields['context_record__datings__period'].choices = \
-            Period.get_types()
-        self.fields['context_record__datings__period'].help_text = \
-            Period.get_help()
-        self.fields['context_record__unit'].choices = models.Unit.get_types()
-        self.fields['context_record__unit'].help_text = models.Unit.get_help()
-
-
-RecordSourceFormSelection = get_form_selection(
-    'RecordSourceFormSelection', _(u"Documentation search"), 'pk',
-    models.ContextRecordSource, RecordSourceSelect, 'get-contextrecordsource',
-    _(u"You should select a document."),
-    get_full_url='get-contextrecordsource-full')
-
-
-class ContextRecordSourceForm(SourceForm):
-    form_slug = "contextrecordsource-general"