From 8fb22554f218dcce59dba4d720d61a2e0f148aea Mon Sep 17 00:00:00 2001 From: Martijn Voncken Date: Wed, 26 Mar 2008 20:24:30 +0000 Subject: [PATCH] webui:minor config fixes --- deluge/ui/webui/config_tabs_deluge.py | 8 ++++---- deluge/ui/webui/lib/newforms_plus.py | 6 +++++- deluge/ui/webui/templates/white/template_style.css | 1 - 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/deluge/ui/webui/config_tabs_deluge.py b/deluge/ui/webui/config_tabs_deluge.py index 0b7562162..47351092b 100644 --- a/deluge/ui/webui/config_tabs_deluge.py +++ b/deluge/ui/webui/config_tabs_deluge.py @@ -44,9 +44,9 @@ config_page = component.get("ConfigPageManager") class NetworkPorts(config_forms.CfgForm ): title = _("Ports") info = _("Restart daemon after changing these values.") - _port_from = forms.IntegerField(_("From")) - _port_to = forms.IntegerField(_("To")) - random_port = forms.CheckBox(_("Random")) + _port_from = forms.IntegerField(label= _("From"),min_value = 0, max_value=65535) + _port_to = forms.IntegerField(label = _("To"),min_value = 0, max_value=65535) + random_port = forms.CheckBox(label = _("Random")) def initial_data(self): data = config_forms.CfgForm.initial_data(self) @@ -61,7 +61,7 @@ class NetworkPorts(config_forms.CfgForm ): def validate(self, data): if (data['_port_to'] < data['_port_from']): - raise ValidationError('"Port from" must be greater than "Port to"') + raise forms.ValidationError('"Port from" must be greater than "Port to"') config_page.register('network','ports', NetworkPorts) diff --git a/deluge/ui/webui/lib/newforms_plus.py b/deluge/ui/webui/lib/newforms_plus.py index e1e8ffa4d..8758f5252 100644 --- a/deluge/ui/webui/lib/newforms_plus.py +++ b/deluge/ui/webui/lib/newforms_plus.py @@ -199,7 +199,11 @@ class DelugeInt(newforms.IntegerField): class DelugeFloat(DelugeInt): def clean(self, value): - return int(DelugeInt.clean(self, value)) + try: + value = int(float(value)) #float->int + except: + pass + return float(DelugeInt.clean(self, value)) #/fields diff --git a/deluge/ui/webui/templates/white/template_style.css b/deluge/ui/webui/templates/white/template_style.css index 0f1589feb..c2b42cd7c 100644 --- a/deluge/ui/webui/templates/white/template_style.css +++ b/deluge/ui/webui/templates/white/template_style.css @@ -260,5 +260,4 @@ ul.errorlist > li { display:inline; padding:0px; margin:0px; - } \ No newline at end of file