X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/410bfa05ee36ed1d99356c443a5f3f6aa3ee9578..7eca93637b2f696dcc140d36e44d5f4810346e2c:/forum/settings/forms.py diff --git a/forum/settings/forms.py b/forum/settings/forms.py index aa5a352..3e3cc5a 100644 --- a/forum/settings/forms.py +++ b/forum/settings/forms.py @@ -1,8 +1,10 @@ import os +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.core.urlresolvers import reverse class DummySetting: pass @@ -13,14 +15,24 @@ class UnfilteredField(forms.CharField): 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: - if isinstance(setting, Setting.emulators.get(str, 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) elif isinstance(setting, Setting.emulators.get(float, DummySetting)): field = forms.FloatField(**setting.field_context) @@ -35,6 +47,12 @@ class SettingsSetForm(forms.Form): self.set = set + def as_table(self): + return self._html_output( + u'