diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index b29f8f772..6c2594ccd 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -16,7 +16,7 @@ __all__ = ( ) -class ProviderFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ProviderFilterForm(CustomFieldModelFilterForm): model = Provider field_groups = [ ['q', 'tag'], @@ -57,7 +57,7 @@ class ProviderFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class ProviderNetworkFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ProviderNetworkFilterForm(CustomFieldModelFilterForm): model = ProviderNetwork field_groups = ( ('q', 'tag'), @@ -77,7 +77,7 @@ class ProviderNetworkFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class CircuitTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class CircuitTypeFilterForm(CustomFieldModelFilterForm): model = CircuitType q = forms.CharField( required=False, @@ -87,7 +87,7 @@ class CircuitTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class CircuitFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class CircuitFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = Circuit field_groups = [ ['q', 'tag'], diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index e61ff250e..72b7418c1 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -47,7 +47,7 @@ __all__ = ( ) -class DeviceComponentFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class DeviceComponentFilterForm(CustomFieldModelFilterForm): field_order = [ 'q', 'name', 'label', 'region_id', 'site_group_id', 'site_id', ] @@ -112,7 +112,7 @@ class DeviceComponentFilterForm(BootstrapMixin, CustomFieldModelFilterForm): ) -class RegionFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class RegionFilterForm(CustomFieldModelFilterForm): model = Region q = forms.CharField( required=False, @@ -128,7 +128,7 @@ class RegionFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class SiteGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class SiteGroupFilterForm(CustomFieldModelFilterForm): model = SiteGroup q = forms.CharField( required=False, @@ -144,7 +144,7 @@ class SiteGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class SiteFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class SiteFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = Site field_order = ['q', 'status', 'region_id', 'tenant_group_id', 'tenant_id', 'asn_id'] field_groups = [ @@ -184,7 +184,7 @@ class SiteFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFo tag = TagFilterField(model) -class LocationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class LocationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = Location field_groups = [ ['q'], @@ -231,7 +231,7 @@ class LocationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilt tag = TagFilterField(model) -class RackRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class RackRoleFilterForm(CustomFieldModelFilterForm): model = RackRole q = forms.CharField( required=False, @@ -241,7 +241,7 @@ class RackRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class RackFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = Rack field_order = ['q', 'region_id', 'site_id', 'location_id', 'status', 'role_id', 'tenant_group_id', 'tenant_id'] field_groups = [ @@ -329,7 +329,7 @@ class RackElevationFilterForm(RackFilterForm): ) -class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class RackReservationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = RackReservation field_order = ['q', 'region_id', 'site_id', 'location_id', 'user_id', 'tenant_group_id', 'tenant_id'] field_groups = [ @@ -377,7 +377,7 @@ class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldMo tag = TagFilterField(model) -class ManufacturerFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ManufacturerFilterForm(CustomFieldModelFilterForm): model = Manufacturer q = forms.CharField( required=False, @@ -387,7 +387,7 @@ class ManufacturerFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class DeviceTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class DeviceTypeFilterForm(CustomFieldModelFilterForm): model = DeviceType field_groups = [ ['q', 'tag'], @@ -460,7 +460,7 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class DeviceRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class DeviceRoleFilterForm(CustomFieldModelFilterForm): model = DeviceRole q = forms.CharField( required=False, @@ -470,7 +470,7 @@ class DeviceRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class PlatformFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class PlatformFilterForm(CustomFieldModelFilterForm): model = Platform q = forms.CharField( required=False, @@ -486,7 +486,7 @@ class PlatformFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldModelFilterForm): +class DeviceFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldModelFilterForm): model = Device field_order = [ 'q', 'region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'status', 'role_id', 'tenant_group_id', @@ -658,7 +658,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt tag = TagFilterField(model) -class VirtualChassisFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class VirtualChassisFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = VirtualChassis field_order = ['q', 'region_id', 'site_group_id', 'site_id', 'tenant_group_id', 'tenant_id'] field_groups = [ @@ -696,7 +696,7 @@ class VirtualChassisFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldMod tag = TagFilterField(model) -class CableFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class CableFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = Cable field_groups = [ ['q', 'tag'], @@ -761,7 +761,7 @@ class CableFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterF tag = TagFilterField(model) -class PowerPanelFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class PowerPanelFilterForm(CustomFieldModelFilterForm): model = PowerPanel field_groups = ( ('q', 'tag'), @@ -807,7 +807,7 @@ class PowerPanelFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class PowerFeedFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class PowerFeedFilterForm(CustomFieldModelFilterForm): model = PowerFeed field_groups = [ ['q', 'tag'], diff --git a/netbox/extras/forms/customfields.py b/netbox/extras/forms/customfields.py index bbd2e91f8..e5c200b6a 100644 --- a/netbox/extras/forms/customfields.py +++ b/netbox/extras/forms/customfields.py @@ -105,7 +105,7 @@ class CustomFieldModelBulkEditForm(BulkEditForm): self.custom_fields.append(cf.name) -class CustomFieldModelFilterForm(forms.Form): +class CustomFieldModelFilterForm(BootstrapMixin, forms.Form): def __init__(self, *args, **kwargs): diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index b7209c035..48fd0a452 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -40,7 +40,7 @@ IPADDRESS_MASK_LENGTH_CHOICES = add_blank_choice([ ]) -class VRFFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class VRFFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = VRF field_groups = [ ['q', 'tag'], @@ -67,7 +67,7 @@ class VRFFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFor tag = TagFilterField(model) -class RouteTargetFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class RouteTargetFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = RouteTarget field_groups = [ ['q', 'tag'], @@ -94,7 +94,7 @@ class RouteTargetFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelF tag = TagFilterField(model) -class RIRFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class RIRFilterForm(CustomFieldModelFilterForm): model = RIR q = forms.CharField( required=False, @@ -111,7 +111,7 @@ class RIRFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class AggregateFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class AggregateFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = Aggregate field_groups = [ ['q', 'tag'], @@ -138,7 +138,7 @@ class AggregateFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFil tag = TagFilterField(model) -class ASNFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class ASNFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = ASN field_groups = [ ['q'], @@ -165,7 +165,7 @@ class ASNFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFor ) -class RoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class RoleFilterForm(CustomFieldModelFilterForm): model = Role q = forms.CharField( required=False, @@ -175,7 +175,7 @@ class RoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class PrefixFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = Prefix field_groups = [ ['q', 'tag'], @@ -277,7 +277,7 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilter tag = TagFilterField(model) -class IPRangeFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class IPRangeFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = IPRange field_groups = [ ['q', 'tag'], @@ -317,7 +317,7 @@ class IPRangeFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilte tag = TagFilterField(model) -class IPAddressFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class IPAddressFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = IPAddress field_order = [ 'q', 'parent', 'family', 'mask_length', 'vrf_id', 'present_in_vrf_id', 'status', 'role', @@ -388,7 +388,7 @@ class IPAddressFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFil tag = TagFilterField(model) -class FHRPGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class FHRPGroupFilterForm(CustomFieldModelFilterForm): model = FHRPGroup field_groups = ( ('q', 'tag'), @@ -423,7 +423,7 @@ class FHRPGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class VLANGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class VLANGroupFilterForm(CustomFieldModelFilterForm): field_groups = [ ['q', 'tag'], ['region', 'sitegroup', 'site', 'location', 'rack'] @@ -467,7 +467,7 @@ class VLANGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class VLANFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = VLAN field_groups = [ ['q', 'tag'], @@ -531,7 +531,7 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFo tag = TagFilterField(model) -class ServiceFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ServiceFilterForm(CustomFieldModelFilterForm): model = Service field_groups = ( ('q', 'tag'), diff --git a/netbox/tenancy/forms/filtersets.py b/netbox/tenancy/forms/filtersets.py index b693db68f..b5e0286a5 100644 --- a/netbox/tenancy/forms/filtersets.py +++ b/netbox/tenancy/forms/filtersets.py @@ -18,7 +18,7 @@ __all__ = ( # Tenants # -class TenantGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class TenantGroupFilterForm(CustomFieldModelFilterForm): model = TenantGroup q = forms.CharField( required=False, @@ -34,7 +34,7 @@ class TenantGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class TenantFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class TenantFilterForm(CustomFieldModelFilterForm): model = Tenant field_groups = ( ('q', 'tag'), @@ -59,7 +59,7 @@ class TenantFilterForm(BootstrapMixin, CustomFieldModelFilterForm): # Contacts # -class ContactGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ContactGroupFilterForm(CustomFieldModelFilterForm): model = ContactGroup q = forms.CharField( required=False, @@ -75,7 +75,7 @@ class ContactGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class ContactRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ContactRoleFilterForm(CustomFieldModelFilterForm): model = ContactRole q = forms.CharField( required=False, @@ -85,7 +85,7 @@ class ContactRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class ContactFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ContactFilterForm(CustomFieldModelFilterForm): model = Contact field_groups = ( ('q', 'tag'), diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py index 1e8156c33..cea980f5f 100644 --- a/netbox/virtualization/forms/filtersets.py +++ b/netbox/virtualization/forms/filtersets.py @@ -20,7 +20,7 @@ __all__ = ( ) -class ClusterTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ClusterTypeFilterForm(CustomFieldModelFilterForm): model = ClusterType q = forms.CharField( required=False, @@ -30,7 +30,7 @@ class ClusterTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class ClusterGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class ClusterGroupFilterForm(CustomFieldModelFilterForm): model = ClusterGroup q = forms.CharField( required=False, @@ -40,7 +40,7 @@ class ClusterGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm): +class ClusterFilterForm(TenancyFilterForm, CustomFieldModelFilterForm): model = Cluster field_order = [ 'q', 'type_id', 'region_id', 'site_id', 'group_id', 'tenant_group_id', 'tenant_id', @@ -95,12 +95,7 @@ class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilte tag = TagFilterField(model) -class VirtualMachineFilterForm( - BootstrapMixin, - LocalConfigContextFilterForm, - TenancyFilterForm, - CustomFieldModelFilterForm -): +class VirtualMachineFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldModelFilterForm): model = VirtualMachine field_groups = [ ['q', 'tag'], diff --git a/netbox/wireless/forms/filtersets.py b/netbox/wireless/forms/filtersets.py index b7eeec76b..681d53ca1 100644 --- a/netbox/wireless/forms/filtersets.py +++ b/netbox/wireless/forms/filtersets.py @@ -16,7 +16,7 @@ __all__ = ( ) -class WirelessLANGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class WirelessLANGroupFilterForm(CustomFieldModelFilterForm): model = WirelessLANGroup q = forms.CharField( required=False, @@ -32,7 +32,7 @@ class WirelessLANGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class WirelessLANFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class WirelessLANFilterForm(CustomFieldModelFilterForm): model = WirelessLAN field_groups = [ ('q', 'tag'), @@ -70,7 +70,7 @@ class WirelessLANFilterForm(BootstrapMixin, CustomFieldModelFilterForm): tag = TagFilterField(model) -class WirelessLinkFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class WirelessLinkFilterForm(CustomFieldModelFilterForm): model = WirelessLink q = forms.CharField( required=False,