Finished Issue 313

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

diff --git a/forum/settings/forms.py b/forum/settings/forms.py
index c0d3a49a4029e0ffce6688613b7dcf00673c283e..b4a93e62660f9b4d8e55533561c1d2e8390d0fc9 100644 (file)
--- a/forum/settings/forms.py
+++ b/forum/settings/forms.py
@@ -14,16 +14,20 @@ class UnfilteredField(forms.CharField):
 
 
 class SettingsSetForm(forms.Form):
-    def __init__(self, set, data=None, *args, **kwargs):
-        if data is None:
-            initial = dict([(setting.name, setting.value) for setting in set])
-        else:
-            initial = None
+    def __init__(self, set, data=None, unsaved=None, *args, **kwargs):
+        initial = dict([(setting.name, setting.value) for setting in set])
+
+        if unsaved:
+            initial.update(unsaved)
 
         super(SettingsSetForm, self).__init__(data, initial=initial, *args, **kwargs)
 
         for setting in set:
-            if isinstance(setting, (Setting.emulators.get(str, DummySetting), Setting.emulators.get(unicode, DummySetting))):
+            widget = setting.field_context.get('widget', None)
+
+            if 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):
                     setting.field_context['widget'] = forms.TextInput(attrs={'class': 'longstring'})
                 field = forms.CharField(**setting.field_context)