From 1f175031bdeb9f226efaddbbe8329d5a713cd631 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 3 Jan 2020 14:26:53 -0500
Subject: [PATCH] #3455: Make ClusterFilterForm a TenancyFilterForm

---
 netbox/virtualization/forms.py | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 2d454494a..a62a427e2 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -183,9 +183,21 @@ class ClusterBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEdit
         ]
 
 
-class ClusterFilterForm(BootstrapMixin, CustomFieldFilterForm):
+class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
     model = Cluster
+    field_order = [
+        'q', 'type', 'region', 'site', 'group', 'tenant_group', 'tenant'
+    ]
     q = forms.CharField(required=False, label='Search')
+    type = FilterChoiceField(
+        queryset=ClusterType.objects.all(),
+        to_field_name='slug',
+        required=False,
+        widget=APISelectMultiple(
+            api_url="/api/virtualization/cluster-types/",
+            value_field='slug',
+        )
+    )
     region = FilterChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
@@ -209,15 +221,6 @@ class ClusterFilterForm(BootstrapMixin, CustomFieldFilterForm):
             null_option=True,
         )
     )
-    type = FilterChoiceField(
-        queryset=ClusterType.objects.all(),
-        to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            api_url="/api/virtualization/cluster-types/",
-            value_field='slug',
-        )
-    )
     group = FilterChoiceField(
         queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
@@ -229,15 +232,6 @@ class ClusterFilterForm(BootstrapMixin, CustomFieldFilterForm):
             null_option=True,
         )
     )
-    tenant = FilterChoiceField(
-        queryset=Tenant.objects.all(),
-        null_label='-- None --',
-        required=False,
-        widget=APISelectMultiple(
-            api_url="/api/tenancy/tenants/",
-            null_option=True,
-        )
-    )
 
 
 class ClusterAddDevicesForm(BootstrapMixin, ChainedFieldsMixin, forms.Form):