Change archaeological sites form (more robust)

1 files changed, 24 insertions, 6 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 9d6f27b50..84af8f287 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -466,12 +466,12 @@ class OperationSelect(TableSelect):
     report_processing = forms.ChoiceField(label=_(u"Report processing"),
                                           choices=[])
     virtual_operation = forms.NullBooleanField(label=_(u"Virtual operation"))
-    archaeological_sites = forms.IntegerField(
-        label=_("Archaelogical site"),
-        widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-archaeologicalsite'),
-            associated_model=models.ArchaeologicalSite),
-        validators=[valid_id(models.ArchaeologicalSite)])
+    # archaeological_sites = forms.IntegerField(
+    #     label=_("Archaelogical site"),
+    #     widget=widgets.JQueryAutoComplete(
+    #         reverse_lazy('autocomplete-archaeologicalsite'),
+    #         associated_model=models.ArchaeologicalSite),
+    #     validators=[valid_id(models.ArchaeologicalSite)])
     history_creator = forms.IntegerField(
         label=_(u"Created by"),
         widget=widgets.JQueryAutoComplete(
@@ -990,6 +990,24 @@ class ArchaeologicalSiteForm(forms.Form):
         return item
 
 
+class ArchaeologicalSiteBasicForm(forms.Form):
+    form_label = _("Archaeological site")
+    base_model = 'archaeological_site'
+    associated_models = {'archaeological_site': models.ArchaeologicalSite}
+    archaeological_site = forms.IntegerField(
+        label=_("Archaelogical site"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy('autocomplete-archaeologicalsite'),
+            associated_model=models.ArchaeologicalSite,
+            new=True),
+        validators=[valid_id(models.ArchaeologicalSite)])
+
+
+ArchaeologicalSiteFormSet = formset_factory(ArchaeologicalSiteBasicForm,
+                                            can_delete=True, formset=FormSet)
+ArchaeologicalSiteFormSet.form_label = _("Archaeological sites")
+
+
 class ArchaeologicalSiteSelectionForm(forms.Form):
     form_label = _("Associated archaelogical sites")
     archaeological_sites = forms.IntegerField(