From bb72af864ba43240babf5361958c3d616f893eb5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 19 Jan 2024 14:32:17 -0500 Subject: [PATCH] Set max_length=2 on extra_choices items; remove custom validation logic --- netbox/extras/api/serializers.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py index 4bab22823..a40a03103 100644 --- a/netbox/extras/api/serializers.py +++ b/netbox/extras/api/serializers.py @@ -172,7 +172,12 @@ class CustomFieldChoiceSetSerializer(ValidatedModelSerializer): choices=CustomFieldChoiceSetBaseChoices, required=False ) - extra_choices = serializers.ListField(child=serializers.ListField(min_length=2)) + extra_choices = serializers.ListField( + child=serializers.ListField( + min_length=2, + max_length=2 + ) + ) class Meta: model = CustomFieldChoiceSet @@ -181,15 +186,6 @@ class CustomFieldChoiceSetSerializer(ValidatedModelSerializer): 'choices_count', 'created', 'last_updated', ] - def validate_extra_choices(self, value): - for choice in value: - if isinstance(choice, list): - if len(choice) < 2: - raise serializers.ValidationError('Each choice must have 2 elements.') - else: - raise serializers.ValidationError('Extra choice must be a list of two elements.') - return value - # # Custom links