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

Remove redundant default choice valiadtion; introduce values property on CustomFieldChoiceSet

Browse Source
This commit is contained in:
Jeremy Stretch 2023-09-06 09:58:05 -04:00
parent 9d6f69aa26
commit 0c8712aeaa
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,15 +317,6 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
'choice_set': _("Choices may be set only on selection fields.") 'choice_set': _("Choices may be set only on selection fields.")
}) })
# 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 [c[0] for c in self.choices]:
raise ValidationError({
'default': _(
"The specified default value ({default}) is not listed as an available choice."
).format(default=self.default)
})
# Object fields must define an object_type; other fields must not # Object fields must define an object_type; other fields must not
if self.type in (CustomFieldTypeChoices.TYPE_OBJECT, CustomFieldTypeChoices.TYPE_MULTIOBJECT): if self.type in (CustomFieldTypeChoices.TYPE_OBJECT, CustomFieldTypeChoices.TYPE_MULTIOBJECT):
if not self.object_type: if not self.object_type:
@ -651,25 +642,21 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
# Validate selected choice # Validate selected choice
elif self.type == CustomFieldTypeChoices.TYPE_SELECT: elif self.type == CustomFieldTypeChoices.TYPE_SELECT:
if value not in [c[0] for c in self.choices]: if value not in self.choice_set.values:
raise ValidationError( raise ValidationError(
_("Invalid choice ({value}). Available choices are: {choices} ({count})") _("Invalid choice ({value}) for choice set {choiceset}.").format(
.format(
value=value, value=value,
choices=', '.join([c[0] for c in self.choices[0:2]]), choiceset=self.choice_set
count=f'({len(self.choices)} choices)' if len(self.choices) > 2 else '',
) )
) )
# Validate all selected choices # Validate all selected choices
elif self.type == CustomFieldTypeChoices.TYPE_MULTISELECT: elif self.type == CustomFieldTypeChoices.TYPE_MULTISELECT:
if not set(value).issubset([c[0] for c in self.choices]): if not set(value).issubset(self.choice_set.values):
raise ValidationError( raise ValidationError(
_("Invalid choice(s) ({invalid_choices}). Available choices are: {available_choices}") _("Invalid choice(s) ({value}) for choice set {choiceset}.").format(
.format( value=value,
invalid_choices=', '.join(value), choiceset=self.choice_set
available_choices=', '.join([c[0] for c in self.choices[0:2]]),
count=f'({len(self.choices)} choices)' if len(self.choices) > 2 else '',
) )
) )
@ -755,6 +742,13 @@ class CustomFieldChoiceSet(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel
def choices_count(self): def choices_count(self):
return len(self.choices) return len(self.choices)
@property
def values(self):
"""
Returns an iterator of the valid choice values.
"""
return (x[0] for x in self.choices)
def clean(self): def clean(self):
if not self.base_choices and not self.extra_choices: if not self.base_choices and not self.extra_choices:
raise ValidationError(_("Must define base or extra choices.")) raise ValidationError(_("Must define base or extra choices."))