Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 11 insertions, 2 deletions

diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 94aafb87c..c132c24be 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012-2016  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012-2017  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -43,7 +43,7 @@ class OperationWizard(Wizard):
     object_parcel_type = 'operation'
     parcel_step_key = 'parcels'
     relations_step_key = 'relations'
-    # step contening the current(s) town(s)
+    # step including the current(s) town(s)
     town_step_keys = ['towns-', 'townsgeneral-']
     town_input_id = 'town'  # input id of the current(s) town(s)
     multi_towns = False  # true if current town are multi valued
@@ -275,6 +275,15 @@ class OperationModificationWizard(OperationWizard):
     modification = True
     filter_owns = {'selec-operation_modification': ['pk']}
 
+    def get_form_kwargs(self, step, **kwargs):
+        kwargs = super(OperationModificationWizard, self).get_form_kwargs(
+            step, **kwargs)
+        print(step)
+        if step != "relations-operation_modification":
+            return kwargs
+        kwargs["left_record"] = self.get_current_object()
+        return kwargs
+
 
 class OperationClosingWizard(ClosingWizard):
     model = models.Operation