From 55f5ede9708d23b5daaa79d687efde19929b3569 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 10 Feb 2020 09:58:33 -0500
Subject: [PATCH] Standardize usage of FilterChoiceField

---
 netbox/circuits/forms.py  | 2 +-
 netbox/dcim/forms.py      | 3 +--
 netbox/extras/forms.py    | 7 +++++--
 netbox/utilities/forms.py | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index caf8d9d36..39b694b1c 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -311,7 +311,7 @@ class CircuitFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
         required=False,
         widget=StaticSelect2Multiple()
     )
-    region = forms.ModelMultipleChoiceField(
+    region = FilterChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
         required=False,
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 81a0be2d2..b12d273a9 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -369,10 +369,9 @@ class SiteFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         required=False,
         widget=StaticSelect2Multiple()
     )
-    region = forms.ModelMultipleChoiceField(
+    region = FilterChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
         widget=APISelectMultiple(
             api_url="/api/dcim/regions/",
             value_field="slug",
diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index 8c9113d39..f9b765379 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -387,11 +387,14 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form):
     )
     action = forms.ChoiceField(
         choices=add_blank_choice(ObjectChangeActionChoices),
-        required=False
+        required=False,
+        widget=StaticSelect2()
     )
+    # TODO: Convert to FilterChoiceField once we have an API endpoint for users
     user = forms.ModelChoiceField(
         queryset=User.objects.order_by('username'),
-        required=False
+        required=False,
+        widget=StaticSelect2()
     )
     changed_object_type = forms.ModelChoiceField(
         queryset=ContentType.objects.order_by('model'),
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 464495fa0..7b31f1e94 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -212,7 +212,7 @@ class SelectWithPK(StaticSelect2):
     option_template_name = 'widgets/select_option_with_pk.html'
 
 
-class ContentTypeSelect(forms.Select):
+class ContentTypeSelect(StaticSelect2):
     """
     Appends an `api-value` attribute equal to the slugified model name for each ContentType. For example:
         <option value="37" api-value="console-server-port">console server port</option>