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

Fixes: #13682 - Fix custom field exceptions and validation

Browse Source
This commit is contained in:
Daniel Sheppard 2023-09-05 09:37:15 -05:00
parent 6db6616892
commit f57925aa02
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,6 +275,8 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
try: try:
if self.type in (CustomFieldTypeChoices.TYPE_TEXT, CustomFieldTypeChoices.TYPE_LONGTEXT): if self.type in (CustomFieldTypeChoices.TYPE_TEXT, CustomFieldTypeChoices.TYPE_LONGTEXT):
default_value = str(self.default) default_value = str(self.default)
elif self.type in (CustomFieldTypeChoices.TYPE_MULTISELECT, CustomFieldTypeChoices.TYPE_MULTIOBJECT):
default_value = [self.default]
else: else:
default_value = self.default default_value = self.default
self.validate(default_value) self.validate(default_value)
@ -282,7 +284,7 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
raise ValidationError({ raise ValidationError({
'default': _( 'default': _(
'Invalid default value "{default}": {message}' 'Invalid default value "{default}": {message}'
).format(default=self.default, message=self.message) ).format(default=self.default, message=err.message)
}) })
# Minimum/maximum values can be set only for numeric fields # Minimum/maximum values can be set only for numeric fields
@ -318,7 +320,8 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
}) })
# A selection field's default (if any) must be present in its available choices # A selection field's default (if any) must be present in its available choices
if self.type == CustomFieldTypeChoices.TYPE_SELECT and self.default and self.default not in self.choices: if self.type == CustomFieldTypeChoices.TYPE_SELECT and self.default and \
self.default not in [c[0] for c in self.choices]:
raise ValidationError({ raise ValidationError({
'default': _( 'default': _(
"The specified default value ({default}) is not listed as an available choice." "The specified default value ({default}) is not listed as an available choice."
@ -653,7 +656,7 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
if value not in [c[0] for c in self.choices]: if value not in [c[0] for c in self.choices]:
raise ValidationError( raise ValidationError(
_("Invalid choice ({value}). Available choices are: {choices}").format( _("Invalid choice ({value}). Available choices are: {choices}").format(
value=value, choices=', '.join(self.choices) value=value, choices=', '.join([c[0] for c in self.choices])
) )
) )
@ -662,7 +665,7 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
if not set(value).issubset([c[0] for c in self.choices]): if not set(value).issubset([c[0] for c in self.choices]):
raise ValidationError( raise ValidationError(
_("Invalid choice(s) ({invalid_choices}). Available choices are: {available_choices}").format( _("Invalid choice(s) ({invalid_choices}). Available choices are: {available_choices}").format(
invalid_choices=', '.join(value), available_choices=', '.join(self.choices)) invalid_choices=', '.join(value), available_choices=', '.join([c[0] for c in self.choices]))
) )
# Validate selected object # Validate selected object