Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

1 files changed, 2 insertions, 2 deletions

diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 043b03f61..42d74f9ef 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -33,6 +33,7 @@ from django.utils.translation import ugettext_lazy as _
 
 import models
 import widgets
+from wizards import MultiValueDict
 
 
 # from formwizard.forms import NamedUrlSessionFormWizard
@@ -224,7 +225,6 @@ class ManageOldType(object):
                 if prefix not in k:
                     continue
                 new_k = k[len(prefix) + 1:]
-                items = []
                 if hasattr(kwargs['data'], 'getlist'):
                     items = kwargs['data'].getlist(k)
                 else:
@@ -238,7 +238,6 @@ class ManageOldType(object):
         if 'initial' in kwargs and kwargs['initial']:
             for k in kwargs['initial']:
                 if k not in self.init_data or not self.init_data[k]:
-                    items = []
                     if hasattr(kwargs['initial'], 'getlist'):
                         items = kwargs['initial'].getlist(k)
                     else:
@@ -249,6 +248,7 @@ class ManageOldType(object):
                         if k not in self.init_data:
                             self.init_data[k] = []
                         self.init_data[k].append(val)
+        self.init_data = MultiValueDict(self.init_data)
         super(ManageOldType, self).__init__(*args, **kwargs)