Clean up validation logic

This commit is contained in:
jeremystretch 2022-09-29 10:23:10 -04:00
parent 3f6ec0ee9f
commit 1f0daa24f7

View File

@ -220,14 +220,11 @@ class CustomField(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLogge
}) })
# Minimum/maximum values can be set only for numeric fields # Minimum/maximum values can be set only for numeric fields
if self.validation_minimum is not None and (self.type != CustomFieldTypeChoices.TYPE_INTEGER and self.type != CustomFieldTypeChoices.TYPE_DECIMAL): if self.type not in (CustomFieldTypeChoices.TYPE_INTEGER, CustomFieldTypeChoices.TYPE_DECIMAL):
raise ValidationError({ if self.validation_minimum:
'validation_minimum': "A minimum value may be set only for numeric fields" raise ValidationError({'validation_minimum': "A minimum value may be set only for numeric fields"})
}) if self.validation_maximum:
if self.validation_maximum is not None and (self.type != CustomFieldTypeChoices.TYPE_INTEGER and self.type != CustomFieldTypeChoices.TYPE_DECIMAL): raise ValidationError({'validation_maximum': "A maximum value may be set only for numeric fields"})
raise ValidationError({
'validation_maximum': "A maximum value may be set only for numeric fields"
})
# Regex validation can be set only for text fields # Regex validation can be set only for text fields
regex_types = ( regex_types = (