From 67189471e726f61eb84af27e92393ba2a0ba8ed2 Mon Sep 17 00:00:00 2001 From: Arthur Date: Tue, 20 Sep 2022 11:26:33 -0700 Subject: [PATCH] 10348 add decimal custom field --- netbox/extras/models/customfields.py | 3 +-- netbox/extras/tests/test_customfields.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/netbox/extras/models/customfields.py b/netbox/extras/models/customfields.py index 5a7e21863..85d703012 100644 --- a/netbox/extras/models/customfields.py +++ b/netbox/extras/models/customfields.py @@ -1,6 +1,5 @@ import re from datetime import datetime, date -import decimal import django_filters from django import forms @@ -499,7 +498,7 @@ class CustomField(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLogge # Validate decimal if self.type == CustomFieldTypeChoices.TYPE_DECIMAL: - if type(value) is not decimal.Decimal: + if type(value) is not str: raise ValidationError("Value must be a decimal.") if self.validation_minimum is not None and value < self.validation_minimum: raise ValidationError(f"Value must be at least {self.validation_minimum}") diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index 435af89d9..22411d436 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -432,7 +432,7 @@ class CustomFieldAPITest(APITestCase): object_type=ContentType.objects.get_for_model(VLAN), default=[vlans[0].pk, vlans[1].pk], ), - CustomField(type=CustomFieldTypeChoices.TYPE_DECIMAL, name='decimal_field', default=123.45), + CustomField(type=CustomFieldTypeChoices.TYPE_DECIMAL, name='decimal_field', default='123.45'), ) for cf in custom_fields: cf.save()