Context record wizard: fix relation form

2 files changed, 11 insertions, 2 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 522c69deb..b3e9a04c0 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -40,7 +40,7 @@ from ishtar_common.forms import FinalForm, FormSet, \
     reverse_lazy, get_form_selection, TableSelect, ManageOldType
 from ishtar_common.forms_common import get_town_field, SourceSelect
 from archaeological_operations.forms import OperationSelect, ParcelField,\
-    RecordRelationsForm as OpeRecordRelationsForm
+    RecordRelationsForm as OpeRecordRelationsForm, RecordRelationsFormSetBase
 
 
 class OperationFormSelection(forms.Form):
@@ -302,7 +302,8 @@ class RecordRelationsForm(OpeRecordRelationsForm):
         if crs:
             self.fields['right_record'].choices = [('', '-' * 2)] + crs
 
-RecordRelationsFormSet = formset_factory(RecordRelationsForm, can_delete=True)
+RecordRelationsFormSet = formset_factory(
+    RecordRelationsForm, can_delete=True, formset=RecordRelationsFormSetBase)
 RecordRelationsFormSet.form_label = _(u"Relations")
 
 
diff --git a/archaeological_context_records/wizards.py b/archaeological_context_records/wizards.py
index fd48ef3d9..cbeb1c1d2 100644
--- a/archaeological_context_records/wizards.py
+++ b/archaeological_context_records/wizards.py
@@ -134,6 +134,14 @@ class RecordModifWizard(RecordWizard):
     model = models.ContextRecord
     filter_owns = {'selec-record_modification': ['pk']}
 
+    def get_form_kwargs(self, step, **kwargs):
+        kwargs = super(RecordModifWizard, self).get_form_kwargs(
+            step, **kwargs)
+        if step != "relations-record_modification":
+            return kwargs
+        kwargs["left_record"] = self.get_current_object()
+        return kwargs
+
 
 class RecordDeletionWizard(DeletionWizard):
     model = models.ContextRecord