From 378c0ac2594537af106b0aca879d19df8d2f31ae Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 25 Aug 2020 16:21:54 -0400
Subject: [PATCH] Fix filtering by custom field value

---
 netbox/extras/filters.py | 47 +++++++++++++---------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py
index 73811c063..c7116fa0d 100644
--- a/netbox/extras/filters.py
+++ b/netbox/extras/filters.py
@@ -21,15 +21,20 @@ __all__ = (
     'TagFilterSet',
 )
 
+EXACT_FILTER_TYPES = (
+    CustomFieldTypeChoices.TYPE_BOOLEAN,
+    CustomFieldTypeChoices.TYPE_DATE,
+    CustomFieldTypeChoices.TYPE_INTEGER,
+    CustomFieldTypeChoices.TYPE_SELECT,
+)
+
 
 class CustomFieldFilter(django_filters.Filter):
     """
     Filter objects by the presence of a CustomFieldValue. The filter's name is used as the CustomField name.
     """
-
     def __init__(self, custom_field, *args, **kwargs):
-        self.cf_type = custom_field.type
-        self.filter_logic = custom_field.filter_logic
+        self.custom_field = custom_field
         super().__init__(*args, **kwargs)
 
     def filter(self, queryset, value):
@@ -38,44 +43,22 @@ class CustomFieldFilter(django_filters.Filter):
         if value is None or not value.strip():
             return queryset
 
-        # Selection fields get special treatment (values must be integers)
-        if self.cf_type == CustomFieldTypeChoices.TYPE_SELECT:
-            try:
-                # Treat 0 as None
-                if int(value) == 0:
-                    return queryset.exclude(
-                        custom_field_values__field__name=self.field_name,
-                    )
-                # Match on exact CustomFieldChoice PK
-                else:
-                    return queryset.filter(
-                        custom_field_values__field__name=self.field_name,
-                        custom_field_values__serialized_value=value,
-                    )
-            except ValueError:
-                return queryset.none()
-
         # Apply the assigned filter logic (exact or loose)
-        if (self.cf_type == CustomFieldTypeChoices.TYPE_BOOLEAN or
-                self.filter_logic == CustomFieldFilterLogicChoices.FILTER_EXACT):
-            queryset = queryset.filter(
-                custom_field_values__field__name=self.field_name,
-                custom_field_values__serialized_value=value
-            )
+        if (
+            self.custom_field.type in EXACT_FILTER_TYPES or
+            self.custom_field.filter_logic == CustomFieldFilterLogicChoices.FILTER_EXACT
+        ):
+            kwargs = {f'custom_field_data__{self.field_name}': value}
         else:
-            queryset = queryset.filter(
-                custom_field_values__field__name=self.field_name,
-                custom_field_values__serialized_value__icontains=value
-            )
+            kwargs = {f'custom_field_data__{self.field_name}__icontains': value}
 
-        return queryset
+        return queryset.filter(**kwargs)
 
 
 class CustomFieldFilterSet(django_filters.FilterSet):
     """
     Dynamically add a Filter for each CustomField applicable to the parent model.
     """
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)