1 files changed, 16 insertions, 1 deletions
diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index e21ce7a2a..7696d67da 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -24,7 +24,8 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db.models import fields
 from django.forms import ClearableFileInput
-from django.forms.widgets import flatatt
+from django.forms.widgets import flatatt, \
+    CheckboxSelectMultiple as CheckboxSelectMultipleBase
 from django.template import Context, loader
 from django.template.defaultfilters import slugify
 from django.utils.encoding import smart_unicode
@@ -56,6 +57,20 @@ class Select2Multiple(forms.SelectMultiple):
         return super(Select2Multiple, self).render(name, value, attrs,
                                                    choices)
 
+class CheckboxSelectMultiple(CheckboxSelectMultipleBase):
+    """
+    Fix initialization bug.
+    Should be corrected on recent Django version.
+    TODO: test and remove (test case: treatment type not keep on modif)
+    """
+    def render(self, name, value, attrs=None, choices=()):
+        if type(value) in (str, unicode):
+            value = value.split(',')
+        if type(value) not in (list, tuple):
+            value = [value]
+        return super(CheckboxSelectMultiple, self).render(name, value, attrs,
+                                                          choices)
+
 
 class MultipleAutocompleteField(forms.MultipleChoiceField):
     def __init__(self, *args, **kwargs):