Merge branch 'master' of github.com:barseghyanartur/django-fobi

This commit is contained in:
Artur Barseghyan 2017-08-30 20:52:18 +02:00
commit e9f69fd185
18 changed files with 42 additions and 42 deletions

View file

@ -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 = {

View file

@ -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

View file

@ -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)]

View file

@ -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)]

View file

@ -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

View file

@ -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)]

View file

@ -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)]

View file

@ -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

View file

@ -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)]

View file

@ -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)]

View file

@ -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

View file

@ -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)]

View file

@ -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)]

View file

@ -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,

View file

@ -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)]

View file

@ -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)]

View file

@ -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)]

View file

@ -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)]