Move Filter and Form to new file, update all files

netbox/tenancy/forms.py

@@ -1,5 +1,4 @@
 from django import forms
-from django.db.models import Count
 from taggit.forms import TagField
 
 from extras.forms import AddRemoveTagsForm, CustomFieldForm, CustomFieldBulkEditForm, CustomFieldFilterForm
@@ -115,39 +114,10 @@ class TenantFilterForm(BootstrapMixin, CustomFieldFilterForm):
         )
     )
 
-#
-# Tenancy filtering form extension
-#
-class TenancyFilterForm(forms.Form):
-    tenant_group = FilterChoiceField(
-        queryset=TenantGroup.objects.all(),
-        to_field_name='slug',
-        null_label='-- None --',
-        widget=APISelectMultiple(
-            api_url="/api/tenancy/tenant-groups/",
-            value_field="slug",
-            null_option=True,
-            filter_for={
-                'tenant': 'group'
-            }
-        )
-    )
-    tenant = FilterChoiceField(
-        queryset=Tenant.objects.all(),
-        to_field_name='slug',
-        null_label='-- None --',
-        widget=APISelectMultiple(
-            api_url="/api/tenancy/tenants/",
-            value_field="slug",
-            null_option=True,
-        )
-    )
-
 
 #
 # Tenancy form extension
 #
-
 class TenancyForm(ChainedFieldsMixin, forms.Form):
     tenant_group = forms.ModelChoiceField(
         queryset=TenantGroup.objects.all(),
@@ -182,4 +152,4 @@ class TenancyForm(ChainedFieldsMixin, forms.Form):
             initial['tenant_group'] = instance.tenant.group
             kwargs['initial'] = initial
 
-        super().__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)