Cleaning up a small mess.

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

diff --git a/forum/settings/forms.py b/forum/settings/forms.py
index 27581d5412eb95c3e953865102c1386c545a6184..0c123011cbc99976a71a9107eba0f50a858fd850 100644 (file)
--- a/forum/settings/forms.py
+++ b/forum/settings/forms.py
@@ -1,8 +1,7 @@
 import os
 import os

-import socket

 from string import strip
 from django import forms
 from string import strip
 from django import forms

-from base import Setting
+from forum.settings.base import Setting

 from django.utils.translation import ugettext as _
 from django.core.files.storage import FileSystemStorage
 
 from django.utils.translation import ugettext as _
 from django.core.files.storage import FileSystemStorage
 


@@ -15,14 +14,22 @@ class UnfilteredField(forms.CharField):
 
 
 class SettingsSetForm(forms.Form):
 
 
 class SettingsSetForm(forms.Form):

-    def __init__(self, set, data=None, *args, **kwargs):
-        if data is None:
-            data = dict([(setting.name, setting.value) for setting in set])
+    def __init__(self, set, data=None, unsaved=None, *args, **kwargs):
+        initial = dict([(setting.name, setting.value) for setting in set])

 
 

-        super(SettingsSetForm, self).__init__(data, *args, **kwargs)
+        if unsaved:
+            initial.update(unsaved)
+
+        super(SettingsSetForm, self).__init__(data, initial=initial, *args, **kwargs)

 
         for setting in set:
 
         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.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):
                     setting.field_context['widget'] = forms.TextInput(attrs={'class': 'longstring'})
                 field = forms.CharField(**setting.field_context)
                 if not setting.field_context.get('widget', None):
                     setting.field_context['widget'] = forms.TextInput(attrs={'class': 'longstring'})
                 field = forms.CharField(**setting.field_context)


@@ -103,6 +110,10 @@ class StringListWidget(forms.Widget):
             return data[name]
 
 class CommaStringListWidget(forms.Textarea):
             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(','))
     def value_from_datadict(self, data, files, name):
         if 'submit' in data:
             return map(strip, data[name].split(','))


@@ -110,36 +121,6 @@ class CommaStringListWidget(forms.Textarea):
             return ', '.join(data[name])    
 
 
             return ', '.join(data[name])    
 
 

-class IPListField(forms.CharField):
-    def clean(self, value):
-        ips = [ip.strip() for ip in value.strip().strip(',').split(',')]
-        iplist = []
-
-        if len(ips) < 1:
-            raise forms.ValidationError(_('Please input at least one ip address'))    
-
-        for ip in ips:
-            try:
-                socket.inet_aton(ip)
-            except socket.error:
-                raise forms.ValidationError(_('Invalid ip address: %s' % ip))
-
-            if not len(ip.split('.')) == 4:
-                raise forms.ValidationError(_('Please use the dotted quad notation for the ip addresses'))
-
-            iplist.append(ip)
-
-        return iplist
-
-class MaintenanceModeForm(forms.Form):
-    ips = IPListField(label=_('Allow ips'),
-                      help_text=_('Comma separated list of ips allowed to access the site while in maintenance'),
-                      required=True,
-                      widget=forms.TextInput(attrs={'class': 'longstring'}))
-
-    message = forms.CharField(label=_('Message'),
-                              help_text=_('A message to display to your site visitors while in maintainance mode'),
-                              widget=forms.Textarea)