Fixes #11544: Catch ValidationError exception when filtering by invalid MAC address

This commit is contained in:
jeremystretch
2023-01-20 12:06:34 -05:00
parent b7434c3dbe
commit a2c7fd0ca4
2 changed files with 8 additions and 0 deletions

View File

@@ -1,6 +1,7 @@
import django_filters
from django import forms
from django.conf import settings
from django.core.exceptions import ValidationError
from django_filters.constants import EMPTY_VALUES
@@ -67,6 +68,12 @@ class MACAddressFilter(django_filters.CharFilter):
class MultiValueMACAddressFilter(django_filters.MultipleChoiceFilter):
field_class = multivalue_field_factory(forms.CharField)
def filter(self, qs, value):
try:
return super().filter(qs, value)
except ValidationError:
return qs.none()
class MultiValueWWNFilter(django_filters.MultipleChoiceFilter):
field_class = multivalue_field_factory(forms.CharField)