Work on warehouse packaging (refs #500)

1 files changed, 13 insertions, 2 deletions

diff --git a/ishtar/ishtar_base/forms.py b/ishtar/ishtar_base/forms.py
index 29d9ab4d6..9faba2ac9 100644
--- a/ishtar/ishtar_base/forms.py
+++ b/ishtar/ishtar_base/forms.py
@@ -269,7 +269,18 @@ class Wizard(NamedUrlSessionFormWizard):
                     value = form.cleaned_data[key]
                     if key in associated_models:
                         if value:
-                            value = associated_models[key].objects.get(pk=value)
+                            model = associated_models[key]
+                            if isinstance(value, unicode) \
+                             or isinstance(value, str) and "," in value:
+                                value = value.split(",")
+                            if isinstance(value, list) \
+                             or isinstance(value, tuple):
+                                value = [model.objects.get(pk=val)
+                                         for val in value if val]
+                                if len(value) == 1:
+                                    value = value[0]
+                            else:
+                                value = model.objects.get(pk=value)
                         else:
                             value = None
                     dct[key] = value
@@ -335,7 +346,7 @@ class Wizard(NamedUrlSessionFormWizard):
                 m = getattr(self.model, dependant_item)
                 model = m.field.rel.to
                 c_dct = other_objs[dependant_item].copy()
-                if hasattr(model, 'history'):
+                if issubclass(model, models.BaseHistorizedItem):
                     c_dct['history_modifier'] = request.user
                 c_item = model(**c_dct)
                 c_item.save()