NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 00:36:11 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Apply suggested changes from PR

Browse Source
This commit is contained in:
jeremystretch 2022-09-29 17:01:09 -04:00
parent 1f0daa24f7
commit 1e5b20970a
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/extras/models/customfields.py
View File

@ -322,6 +322,8 @@ class CustomField(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLogge
initial=initial, initial=initial,
max_digits=12, max_digits=12,
decimal_places=4, decimal_places=4,
min_value=self.validation_minimum,
max_value=self.validation_maximum
) )
# Boolean # Boolean
@ -496,13 +498,11 @@ class CustomField(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLogge
# Validate decimal # Validate decimal
elif self.type == CustomFieldTypeChoices.TYPE_DECIMAL: elif self.type == CustomFieldTypeChoices.TYPE_DECIMAL:
if type(value) is not decimal.Decimal and type(value) is not str: if type(value) is not decimal.Decimal:
raise ValidationError("Value must be a decimal.") raise ValidationError("Value must be a decimal.")
if self.validation_minimum is not None and value < self.validation_minimum:
converted = decimal.Decimal(value)
if self.validation_minimum is not None and converted < self.validation_minimum:
raise ValidationError(f"Value must be at least {self.validation_minimum}") raise ValidationError(f"Value must be at least {self.validation_minimum}")
if self.validation_maximum is not None and converted > self.validation_maximum: if self.validation_maximum is not None and value > self.validation_maximum:
raise ValidationError(f"Value must not exceed {self.validation_maximum}") raise ValidationError(f"Value must not exceed {self.validation_maximum}")
# Validate boolean # Validate boolean

10
netbox/utilities/filters.py
View File

@ -3,8 +3,6 @@ from django import forms
from django.conf import settings from django.conf import settings
from django_filters.constants import EMPTY_VALUES from django_filters.constants import EMPTY_VALUES
from utilities.forms import MACAddressField
def multivalue_field_factory(field_class): def multivalue_field_factory(field_class):
""" """
@ -23,14 +21,6 @@ def multivalue_field_factory(field_class):
field.to_python(v) for v in value if v field.to_python(v) for v in value if v
] ]
def run_validators(self, value):
for v in value:
super().run_validators(v)
def validate(self, value):
for v in value:
super().validate(v)
return type(f'MultiValue{field_class.__name__}', (NewField,), dict()) return type(f'MultiValue{field_class.__name__}', (NewField,), dict())