From 9e5b3a4724a0bd6e692cdcaa5760e5e0c157b679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Pr=C3=A9vidente?= Date: Wed, 30 Aug 2017 12:32:18 +0200 Subject: [PATCH] =?UTF-8?q?Fields=20accepts=20the=200=20value=20in=20min?= =?UTF-8?q?=5Fvalue/max=5Fvalue/=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fields/date_drop_down/base.py | 2 +- .../form_elements/fields/decimal/base.py | 10 ++++----- .../form_elements/fields/email/base.py | 2 +- .../plugins/form_elements/fields/file/base.py | 2 +- .../form_elements/fields/float/base.py | 4 ++-- .../form_elements/fields/hidden/base.py | 2 +- .../form_elements/fields/input/base.py | 22 +++++++++---------- .../form_elements/fields/integer/base.py | 4 ++-- .../form_elements/fields/ip_address/base.py | 2 +- .../form_elements/fields/password/base.py | 2 +- .../form_elements/fields/range_select/base.py | 4 ++-- .../form_elements/fields/regex/base.py | 2 +- .../fields/select_multiple_with_max/base.py | 2 +- .../form_elements/fields/slider/base.py | 16 +++++++------- .../plugins/form_elements/fields/slug/base.py | 2 +- .../plugins/form_elements/fields/text/base.py | 2 +- .../plugins/form_elements/fields/url/base.py | 2 +- .../form_elements/security/honeypot/base.py | 2 +- 18 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/base.py b/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/base.py index 4eff828c..7751effe 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/base.py @@ -37,7 +37,7 @@ class DateDropDownInputPlugin(FormFieldPlugin): } years = None - if self.data.year_min and self.data.year_max: + if self.data.year_min is not None and self.data.year_max is not None: years = range(self.data.year_min, self.data.year_max) field_kwargs = { diff --git a/src/fobi/contrib/plugins/form_elements/fields/decimal/base.py b/src/fobi/contrib/plugins/form_elements/fields/decimal/base.py index 4a8704ea..971fbfd4 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/decimal/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/decimal/base.py @@ -43,25 +43,25 @@ class DecimalInputPlugin(FormFieldPlugin): 'required': self.data.required, } - if self.data.initial: + if self.data.initial is not None: data_initial = decimal.Decimal(str(self.data.initial)) field_kwargs.update({'initial': data_initial}) - if self.data.max_value: + if self.data.max_value is not None: data_max_value = decimal.Decimal(str(self.data.max_value)) field_kwargs['max_value'] = data_max_value widget_attrs['max'] = data_max_value - if self.data.min_value: + if self.data.min_value is not None: data_min_value = decimal.Decimal(str(self.data.min_value)) field_kwargs['min_value'] = data_min_value widget_attrs['min'] = data_min_value - if self.data.max_digits: + if self.data.max_digits is not None: data_max_digits = int(self.data.max_digits) field_kwargs['max_digits'] = data_max_digits - if self.data.decimal_places: + if self.data.decimal_places is not None: data_decimal_places = int(self.data.decimal_places) field_kwargs['decimal_places'] = data_decimal_places diff --git a/src/fobi/contrib/plugins/form_elements/fields/email/base.py b/src/fobi/contrib/plugins/form_elements/fields/email/base.py index 3b888390..434186f0 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/email/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/email/base.py @@ -43,7 +43,7 @@ class EmailInputPlugin(FormFieldPlugin): 'required': self.data.required, 'widget': TextInput(attrs=widget_attrs), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = self.data.max_length return [(self.data.name, EmailField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/file/base.py b/src/fobi/contrib/plugins/form_elements/fields/file/base.py index 10fdc2fe..1468cc34 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/file/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/file/base.py @@ -39,7 +39,7 @@ class FileInputPlugin(FormFieldPlugin): 'required': self.data.required, 'widget': ClearableFileInput(attrs={}), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = self.data.max_length return [(self.data.name, FileField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/float/base.py b/src/fobi/contrib/plugins/form_elements/fields/float/base.py index e6462892..3335ecb8 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/float/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/float/base.py @@ -42,12 +42,12 @@ class FloatInputPlugin(FormFieldPlugin): 'required': self.data.required, } - if self.data.max_value: + if self.data.max_value is not None: data_max_value = float(self.data.max_value) field_kwargs['max_value'] = data_max_value widget_attrs['max'] = data_max_value - if self.data.min_value: + if self.data.min_value is not None: data_min_value = float(self.data.min_value) field_kwargs['min_value'] = data_min_value widget_attrs['min'] = data_min_value diff --git a/src/fobi/contrib/plugins/form_elements/fields/hidden/base.py b/src/fobi/contrib/plugins/form_elements/fields/hidden/base.py index 431222c8..4b533ecc 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/hidden/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/hidden/base.py @@ -38,7 +38,7 @@ class HiddenInputPlugin(FormFieldPlugin): attrs={'class': theme.form_element_html_class} ), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = self.data.max_length return [(self.data.name, CharField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/input/base.py b/src/fobi/contrib/plugins/form_elements/fields/input/base.py index f0376d3e..54f5ac82 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/input/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/input/base.py @@ -35,37 +35,37 @@ class InputPlugin(FormFieldPlugin): 'type': self.data.type_value, } - if self.data.autocomplete_value: + if self.data.autocomplete_value is not None: widget_attrs.update({'autocomplete': 'on'}) - if self.data.autofocus_value: + if self.data.autofocus_value is not None: widget_attrs.update({'autofocus': 'autofocus'}) - if self.data.disabled_value: + if self.data.disabled_value is not None: widget_attrs.update({'disabled': 'disabled'}) # if self.data.formnovalidate_value: # widget_attrs.update({'formnovalidate': 'formnovalidate'}) - if self.data.list_value: + if self.data.list_value is not None: widget_attrs.update({'list': self.data.list_value}) - if self.data.max_value: + if self.data.max_value is not None: widget_attrs.update({'max': self.data.max_value}) - if self.data.min_value: + if self.data.min_value is not None: widget_attrs.update({'min': self.data.min_value}) - if self.data.multiple_value: + if self.data.multiple_value is not None: widget_attrs.update({'multiple': 'multiple'}) - if self.data.pattern_value: + if self.data.pattern_value is not None: widget_attrs.update({'pattern': self.data.pattern_value}) - if self.data.readonly_value: + if self.data.readonly_value is not None: widget_attrs.update({'readonly': 'readonly'}) - if self.data.step_value: + if self.data.step_value is not None: widget_attrs.update({'step': self.data.step_value}) if self.data.type_value and self.data.type_value in ('submit', @@ -82,7 +82,7 @@ class InputPlugin(FormFieldPlugin): 'required': self.data.required, 'widget': TextInput(attrs=widget_attrs), } - # if self.data.max_length: + # if self.data.max_length is not None: # kwargs['max_length'] = self.data.max_length return [(self.data.name, Field, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/integer/base.py b/src/fobi/contrib/plugins/form_elements/fields/integer/base.py index 859c0544..149aafbe 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/integer/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/integer/base.py @@ -40,11 +40,11 @@ class IntegerInputPlugin(FormFieldPlugin): 'initial': self.data.initial, 'required': self.data.required, } - if self.data.max_value: + if self.data.max_value is not None: data_max_value = int(self.data.max_value) field_kwargs['max_value'] = data_max_value widget_attrs['max'] = data_max_value - if self.data.min_value: + if self.data.min_value is not None: data_min_value = int(self.data.min_value) field_kwargs['min_value'] = data_min_value widget_attrs['min'] = data_min_value diff --git a/src/fobi/contrib/plugins/form_elements/fields/ip_address/base.py b/src/fobi/contrib/plugins/form_elements/fields/ip_address/base.py index b578fc1c..0b7acb76 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/ip_address/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/ip_address/base.py @@ -41,7 +41,7 @@ class IPAddressInputPlugin(FormFieldPlugin): 'required': self.data.required, 'widget': TextInput(attrs=widget_attrs), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = self.data.max_length return [(self.data.name, GenericIPAddressField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/password/base.py b/src/fobi/contrib/plugins/form_elements/fields/password/base.py index b40fbd65..e31bc38f 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/password/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/password/base.py @@ -41,7 +41,7 @@ class PasswordInputPlugin(FormFieldPlugin): 'required': self.data.required, 'widget': PasswordInput(attrs=widget_attrs), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = self.data.max_length return [(self.data.name, CharField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/range_select/base.py b/src/fobi/contrib/plugins/form_elements/fields/range_select/base.py index fdeac2cf..3d86d111 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/range_select/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/range_select/base.py @@ -66,10 +66,10 @@ class RangeSelectInputPlugin(FormFieldPlugin): Might be used in integration plugins. """ max_value = int(self.data.max_value) \ - if self.data.max_value \ + if self.data.max_value is not None \ else INITIAL_MAX_VALUE min_value = int(self.data.min_value) \ - if self.data.min_value \ + if self.data.min_value is not None \ else INITIAL_MIN_VALUE step = int(self.data.step) if self.data.step else STEP diff --git a/src/fobi/contrib/plugins/form_elements/fields/regex/base.py b/src/fobi/contrib/plugins/form_elements/fields/regex/base.py index 4ca11e3f..6811de63 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/regex/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/regex/base.py @@ -43,7 +43,7 @@ class RegexInputPlugin(FormFieldPlugin): 'widget': TextInput(attrs=widget_attrs), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = self.data.max_length return [(self.data.name, RegexField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/base.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/base.py index bf0a54b5..e771e583 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/base.py @@ -56,7 +56,7 @@ class SelectMultipleWithMaxInputPlugin(FormFieldPlugin): ), } - if self.data.max_choices: + if self.data.max_choices is not None: field_kwargs['max_choices'] = self.data.max_choices return [(self.data.name, MultipleChoiceWithMaxField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/slider/base.py b/src/fobi/contrib/plugins/form_elements/fields/slider/base.py index c36efcfe..b0b87221 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/slider/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/slider/base.py @@ -72,12 +72,12 @@ class SliderInputPlugin(FormFieldPlugin): Might be used in integration plugins. """ max_value = int(self.data.max_value) \ - if self.data.max_value \ + if self.data.max_value is not None \ else INITIAL_MAX_VALUE min_value = int(self.data.min_value) \ - if self.data.min_value \ + if self.data.min_value is not None \ else INITIAL_MIN_VALUE - step = int(self.data.step) if self.data.step else STEP + step = int(self.data.step) if self.data.step is not None else STEP if PY3: _choices = [__r for __r in range(min_value, max_value + 1, step)] @@ -93,17 +93,17 @@ class SliderInputPlugin(FormFieldPlugin): """Get form field instances.""" initial = self.get_initial() max_value = int(self.data.max_value) \ - if self.data.max_value \ + if self.data.max_value is not None \ else INITIAL_MAX_VALUE min_value = int(self.data.min_value) \ - if self.data.min_value \ + if self.data.min_value is not None \ else INITIAL_MIN_VALUE - step = int(self.data.step) if self.data.step else STEP + step = int(self.data.step) if self.data.step is not None else STEP tooltip = self.data.tooltip \ - if self.data.tooltip \ + if self.data.tooltip is not None \ else SLIDER_DEFAULT_TOOLTIP handle = self.data.handle \ - if self.data.handle \ + if self.data.handle is not None \ else SLIDER_DEFAULT_HANDLE custom_ticks = get_select_field_choices(self.data.custom_ticks, diff --git a/src/fobi/contrib/plugins/form_elements/fields/slug/base.py b/src/fobi/contrib/plugins/form_elements/fields/slug/base.py index 82878dbb..e5b41b29 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/slug/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/slug/base.py @@ -41,7 +41,7 @@ class SlugInputPlugin(FormFieldPlugin): 'required': self.data.required, 'widget': TextInput(attrs=widget_attrs), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = int(self.data.max_length) return [(self.data.name, SlugField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/text/base.py b/src/fobi/contrib/plugins/form_elements/fields/text/base.py index 1aad7cab..5d0a8023 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/text/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/text/base.py @@ -41,7 +41,7 @@ class TextInputPlugin(FormFieldPlugin): 'required': self.data.required, 'widget': TextInput(attrs=widget_attrs), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = int(self.data.max_length) return [(self.data.name, CharField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/fields/url/base.py b/src/fobi/contrib/plugins/form_elements/fields/url/base.py index efd119bd..90c73500 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/url/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/url/base.py @@ -52,7 +52,7 @@ class URLInputPlugin(FormFieldPlugin): 'required': self.data.required, 'widget': URLInput(attrs=widget_attrs), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = int(self.data.max_length) return [(self.data.name, URLField, field_kwargs)] diff --git a/src/fobi/contrib/plugins/form_elements/security/honeypot/base.py b/src/fobi/contrib/plugins/form_elements/security/honeypot/base.py index dce45c6b..2a7f4e00 100644 --- a/src/fobi/contrib/plugins/form_elements/security/honeypot/base.py +++ b/src/fobi/contrib/plugins/form_elements/security/honeypot/base.py @@ -41,7 +41,7 @@ class HoneypotInputPlugin(FormElementPlugin): ), } - if self.data.max_length: + if self.data.max_length is not None: field_kwargs['max_length'] = self.data.max_length # return [(self.data.name, (HoneypotField, TextInput), kwargs)]