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

[osqa.git] / forum / settings / forms.py

diff --git a/forum/settings/forms.py b/forum/settings/forms.py
index aa5a35285f6c03294bba0999ee52bd4d49d1cd61..81e5446583ff8cd66d0a8f15ddae5e5afa4c3bb3 100644 (file)
--- a/forum/settings/forms.py
+++ b/forum/settings/forms.py
@@ -1,4 +1,5 @@
 import os
+from string import strip
 from django import forms
 from base import Setting
 from django.utils.translation import ugettext as _
@@ -20,7 +21,7 @@ class SettingsSetForm(forms.Form):
         super(SettingsSetForm, self).__init__(data, *args, **kwargs)
 
         for setting in set:
-            if isinstance(setting, Setting.emulators.get(str, DummySetting)):
+            if isinstance(setting, (Setting.emulators.get(str, DummySetting), Setting.emulators.get(unicode, DummySetting))):
                 field = forms.CharField(**setting.field_context)
             elif isinstance(setting, Setting.emulators.get(float, DummySetting)):
                 field = forms.FloatField(**setting.field_context)
@@ -92,4 +93,13 @@ class StringListWidget(forms.Widget):
         else:
             return data[name]
 
+class CommaStringListWidget(forms.Textarea):
+    def value_from_datadict(self, data, files, name):
+        if 'submit' in data:
+            return map(strip, data[name].split(','))
+        else:
+            return ', '.join(data[name])    
+
+
+