From ef1ea373049bb116a91fa41148e861c1f1ee8cf0 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 26 Apr 2018 18:42:35 +0200
Subject: Wizard: fix M2M saving inside formsets

---
 ishtar_common/wizards.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'ishtar_common/wizards.py')

diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index 89a155c1c..2182e9060 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -528,8 +528,14 @@ class Wizard(NamedUrlWizardView):
                         if value is None or value in ['', []]:
                             continue
                         if key in associated_models:
-                            value = associated_models[key].objects.get(
-                                pk=value)
+                            if type(value) in (tuple, list):
+                                value = [
+                                    associated_models[key].objects.get(pk=v)
+                                    for v in value
+                                ]
+                            else:
+                                value = associated_models[key].objects.get(
+                                    pk=value)
                         if multi:
                             vals[key] = value
                         else:
-- 
cgit v1.2.3