From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 22 Jun 2010 23:39:54 +0000 (+0000)
Subject: Fixes a problem with a widget that was causing weird rendering of comma separated... 
X-Git-Tag: live~692
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/deac5b0493ee766f3958f363eb92f5265af63961

Fixes a problem with a widget that was causing weird rendering of comma separated lists of strings in the admin area.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@442 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/settings/forms.py b/forum/settings/forms.py
index b4a93e6..0c12301 100644
--- a/forum/settings/forms.py
+++ b/forum/settings/forms.py
@@ -25,7 +25,9 @@ class SettingsSetForm(forms.Form):
         for setting in set:
             widget = setting.field_context.get('widget', None)
 
-            if widget is forms.RadioSelect or isinstance(widget, forms.RadioSelect):
+            if widget is forms.CheckboxSelectMultiple or widget is forms.SelectMultiple or isinstance(widget, forms.SelectMultiple):
+                field = forms.MultipleChoiceField(**setting.field_context)
+            elif widget is forms.RadioSelect or isinstance(widget, forms.RadioSelect):
                 field = forms.ChoiceField(**setting.field_context)
             elif isinstance(setting, (Setting.emulators.get(str, DummySetting), Setting.emulators.get(unicode, DummySetting))):
                 if not setting.field_context.get('widget', None):
@@ -108,6 +110,10 @@ class StringListWidget(forms.Widget):
             return data[name]
 
 class CommaStringListWidget(forms.Textarea):
+    def render(self, name, value, attrs=None):
+        return super(CommaStringListWidget, self).render(name, ', '.join(value), attrs)
+
+
     def value_from_datadict(self, data, files, name):
         if 'submit' in data:
             return map(strip, data[name].split(','))
@@ -117,3 +123,4 @@ class CommaStringListWidget(forms.Textarea):
 
 
 
+