resolves a typo in user suspend functionality, indefinetly should be indefinitely...

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

diff --git a/forum/settings/forms.py b/forum/settings/forms.py
index b4a93e62660f9b4d8e55533561c1d2e8390d0fc9..3e3cc5afbf92833045346342b74d5b5c090df4aa 100644 (file)
--- a/forum/settings/forms.py
+++ b/forum/settings/forms.py
@@ -4,6 +4,7 @@ from django import forms
 from forum.settings.base import Setting
 from django.utils.translation import ugettext as _
 from django.core.files.storage import FileSystemStorage
+from django.core.urlresolvers import reverse
 
 class DummySetting:
     pass
@@ -25,7 +26,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,12 +111,30 @@ 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(','))
         else:
             return ', '.join(data[name])    
 
+class TestEmailSettingsWidget(forms.TextInput):
+    def render(self, name, value, attrs=None):
+        if not value:
+            value = ''
 
-
-
+        return """
+            <div id="test_email_settings">
+                <a href="%s" onclick="return false;" class="button test_button" href="/">Test</a>
+
+                <div style="margin-top: 7px">
+                <div style="display: none" class="ajax_indicator">
+                    Testing your current e-mail settings. Please, wait.
+                </div>
+                <div class="test_status"></div>
+                </div>
+            </div>
+            """ % reverse("test_email_settings")
\ No newline at end of file