Fixes #4240: Fix exception when filtering foreign keys by NULL

netbox/utilities/forms.py

@@ -2,8 +2,9 @@ import csv
 import json
 import re
 from io import StringIO
-import yaml
 
+import django_filters
+import yaml
 from django import forms
 from django.conf import settings
 from django.contrib.postgres.forms.jsonb import JSONField as _JSONField, InvalidJSONInput
@@ -564,18 +565,17 @@ class TagFilterField(forms.MultipleChoiceField):
 
 
 class DynamicModelChoiceMixin:
-    field_modifier = ''
+    filter = django_filters.ModelChoiceFilter
 
     def get_bound_field(self, form, field_name):
         bound_field = BoundField(form, self, field_name)
 
         # Modify the QuerySet of the field before we return it. Limit choices to any data already bound: Options
         # will be populated on-demand via the APISelect widget.
-        field_name = '{}{}'.format(self.to_field_name or 'pk', self.field_modifier)
-        if bound_field.data:
-            self.queryset = self.queryset.filter(**{field_name: self.prepare_value(bound_field.data)})
-        elif bound_field.initial:
-            self.queryset = self.queryset.filter(**{field_name: self.prepare_value(bound_field.initial)})
+        data = bound_field.data or bound_field.initial
+        if data:
+            filter = self.filter(field_name=self.to_field_name or 'pk', queryset=self.queryset)
+            self.queryset = filter.filter(self.queryset, data)
         else:
             self.queryset = self.queryset.none()
 
@@ -594,7 +594,7 @@ class DynamicModelMultipleChoiceField(DynamicModelChoiceMixin, forms.ModelMultip
     """
     A multiple-choice version of DynamicModelChoiceField.
     """
-    field_modifier = '__in'
+    filter = django_filters.ModelMultipleChoiceFilter
 
 
 class LaxURLField(forms.URLField):