Skip to content

Commit ed2231e

Browse files
jeremystretchjeremystretch
committed
Apply BootstrapMixin to CustomFieldModelFilterForm
1 parent 55049bb commit ed2231e

File tree

7 files changed

+47
-52
lines changed

7 files changed

+47
-52
lines changed

‎netbox/circuits/forms/filtersets.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
)
1717

1818

19-
class ProviderFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
19+
class ProviderFilterForm(CustomFieldModelFilterForm):
2020
model = Provider
2121
field_groups = [
2222
['q', 'tag'],
@@ -57,7 +57,7 @@ class ProviderFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
5757
tag = TagFilterField(model)
5858

5959

60-
class ProviderNetworkFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
60+
class ProviderNetworkFilterForm(CustomFieldModelFilterForm):
6161
model = ProviderNetwork
6262
field_groups = (
6363
('q', 'tag'),
@@ -77,7 +77,7 @@ class ProviderNetworkFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
7777
tag = TagFilterField(model)
7878

7979

80-
class CircuitTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
80+
class CircuitTypeFilterForm(CustomFieldModelFilterForm):
8181
model = CircuitType
8282
q = forms.CharField(
8383
required=False,
@@ -87,7 +87,7 @@ class CircuitTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
8787
tag = TagFilterField(model)
8888

8989

90-
class CircuitFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
90+
class CircuitFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
9191
model = Circuit
9292
field_groups = [
9393
['q', 'tag'],

‎netbox/dcim/forms/filtersets.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
)
4848

4949

50-
class DeviceComponentFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
50+
class DeviceComponentFilterForm(CustomFieldModelFilterForm):
5151
field_order = [
5252
'q', 'name', 'label', 'region_id', 'site_group_id', 'site_id',
5353
]
@@ -112,7 +112,7 @@ class DeviceComponentFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
112112
)
113113

114114

115-
class RegionFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
115+
class RegionFilterForm(CustomFieldModelFilterForm):
116116
model = Region
117117
q = forms.CharField(
118118
required=False,
@@ -128,7 +128,7 @@ class RegionFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
128128
tag = TagFilterField(model)
129129

130130

131-
class SiteGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
131+
class SiteGroupFilterForm(CustomFieldModelFilterForm):
132132
model = SiteGroup
133133
q = forms.CharField(
134134
required=False,
@@ -144,7 +144,7 @@ class SiteGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
144144
tag = TagFilterField(model)
145145

146146

147-
class SiteFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
147+
class SiteFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
148148
model = Site
149149
field_order = ['q', 'status', 'region_id', 'tenant_group_id', 'tenant_id', 'asn_id']
150150
field_groups = [
@@ -184,7 +184,7 @@ class SiteFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFo
184184
tag = TagFilterField(model)
185185

186186

187-
class LocationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
187+
class LocationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
188188
model = Location
189189
field_groups = [
190190
['q'],
@@ -231,7 +231,7 @@ class LocationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilt
231231
tag = TagFilterField(model)
232232

233233

234-
class RackRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
234+
class RackRoleFilterForm(CustomFieldModelFilterForm):
235235
model = RackRole
236236
q = forms.CharField(
237237
required=False,
@@ -241,7 +241,7 @@ class RackRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
241241
tag = TagFilterField(model)
242242

243243

244-
class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
244+
class RackFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
245245
model = Rack
246246
field_order = ['q', 'region_id', 'site_id', 'location_id', 'status', 'role_id', 'tenant_group_id', 'tenant_id']
247247
field_groups = [
@@ -329,7 +329,7 @@ class RackElevationFilterForm(RackFilterForm):
329329
)
330330

331331

332-
class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
332+
class RackReservationFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
333333
model = RackReservation
334334
field_order = ['q', 'region_id', 'site_id', 'location_id', 'user_id', 'tenant_group_id', 'tenant_id']
335335
field_groups = [
@@ -377,7 +377,7 @@ class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldMo
377377
tag = TagFilterField(model)
378378

379379

380-
class ManufacturerFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
380+
class ManufacturerFilterForm(CustomFieldModelFilterForm):
381381
model = Manufacturer
382382
q = forms.CharField(
383383
required=False,
@@ -387,7 +387,7 @@ class ManufacturerFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
387387
tag = TagFilterField(model)
388388

389389

390-
class DeviceTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
390+
class DeviceTypeFilterForm(CustomFieldModelFilterForm):
391391
model = DeviceType
392392
field_groups = [
393393
['q', 'tag'],
@@ -460,7 +460,7 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
460460
tag = TagFilterField(model)
461461

462462

463-
class DeviceRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
463+
class DeviceRoleFilterForm(CustomFieldModelFilterForm):
464464
model = DeviceRole
465465
q = forms.CharField(
466466
required=False,
@@ -470,7 +470,7 @@ class DeviceRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
470470
tag = TagFilterField(model)
471471

472472

473-
class PlatformFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
473+
class PlatformFilterForm(CustomFieldModelFilterForm):
474474
model = Platform
475475
q = forms.CharField(
476476
required=False,
@@ -486,7 +486,7 @@ class PlatformFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
486486
tag = TagFilterField(model)
487487

488488

489-
class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldModelFilterForm):
489+
class DeviceFilterForm(LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldModelFilterForm):
490490
model = Device
491491
field_order = [
492492
'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
658658
tag = TagFilterField(model)
659659

660660

661-
class VirtualChassisFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
661+
class VirtualChassisFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
662662
model = VirtualChassis
663663
field_order = ['q', 'region_id', 'site_group_id', 'site_id', 'tenant_group_id', 'tenant_id']
664664
field_groups = [
@@ -696,7 +696,7 @@ class VirtualChassisFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldMod
696696
tag = TagFilterField(model)
697697

698698

699-
class CableFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
699+
class CableFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
700700
model = Cable
701701
field_groups = [
702702
['q', 'tag'],
@@ -761,7 +761,7 @@ class CableFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterF
761761
tag = TagFilterField(model)
762762

763763

764-
class PowerPanelFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
764+
class PowerPanelFilterForm(CustomFieldModelFilterForm):
765765
model = PowerPanel
766766
field_groups = (
767767
('q', 'tag'),
@@ -807,7 +807,7 @@ class PowerPanelFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
807807
tag = TagFilterField(model)
808808

809809

810-
class PowerFeedFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
810+
class PowerFeedFilterForm(CustomFieldModelFilterForm):
811811
model = PowerFeed
812812
field_groups = [
813813
['q', 'tag'],

‎netbox/extras/forms/customfields.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def __init__(self, *args, **kwargs):
105105
self.custom_fields.append(cf.name)
106106

107107

108-
class CustomFieldModelFilterForm(forms.Form):
108+
class CustomFieldModelFilterForm(BootstrapMixin, forms.Form):
109109

110110
def __init__(self, *args, **kwargs):
111111

‎netbox/ipam/forms/filtersets.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
])
4141

4242

43-
class VRFFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
43+
class VRFFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
4444
model = VRF
4545
field_groups = [
4646
['q', 'tag'],
@@ -67,7 +67,7 @@ class VRFFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFor
6767
tag = TagFilterField(model)
6868

6969

70-
class RouteTargetFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
70+
class RouteTargetFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
7171
model = RouteTarget
7272
field_groups = [
7373
['q', 'tag'],
@@ -94,7 +94,7 @@ class RouteTargetFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelF
9494
tag = TagFilterField(model)
9595

9696

97-
class RIRFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
97+
class RIRFilterForm(CustomFieldModelFilterForm):
9898
model = RIR
9999
q = forms.CharField(
100100
required=False,
@@ -111,7 +111,7 @@ class RIRFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
111111
tag = TagFilterField(model)
112112

113113

114-
class AggregateFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
114+
class AggregateFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
115115
model = Aggregate
116116
field_groups = [
117117
['q', 'tag'],
@@ -138,7 +138,7 @@ class AggregateFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFil
138138
tag = TagFilterField(model)
139139

140140

141-
class ASNFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
141+
class ASNFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
142142
model = ASN
143143
field_groups = [
144144
['q'],
@@ -165,7 +165,7 @@ class ASNFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFor
165165
)
166166

167167

168-
class RoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
168+
class RoleFilterForm(CustomFieldModelFilterForm):
169169
model = Role
170170
q = forms.CharField(
171171
required=False,
@@ -175,7 +175,7 @@ class RoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
175175
tag = TagFilterField(model)
176176

177177

178-
class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
178+
class PrefixFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
179179
model = Prefix
180180
field_groups = [
181181
['q', 'tag'],
@@ -277,7 +277,7 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilter
277277
tag = TagFilterField(model)
278278

279279

280-
class IPRangeFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
280+
class IPRangeFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
281281
model = IPRange
282282
field_groups = [
283283
['q', 'tag'],
@@ -317,7 +317,7 @@ class IPRangeFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilte
317317
tag = TagFilterField(model)
318318

319319

320-
class IPAddressFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
320+
class IPAddressFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
321321
model = IPAddress
322322
field_order = [
323323
'q', 'parent', 'family', 'mask_length', 'vrf_id', 'present_in_vrf_id', 'status', 'role',
@@ -388,7 +388,7 @@ class IPAddressFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFil
388388
tag = TagFilterField(model)
389389

390390

391-
class FHRPGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
391+
class FHRPGroupFilterForm(CustomFieldModelFilterForm):
392392
model = FHRPGroup
393393
field_groups = (
394394
('q', 'tag'),
@@ -423,7 +423,7 @@ class FHRPGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
423423
tag = TagFilterField(model)
424424

425425

426-
class VLANGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
426+
class VLANGroupFilterForm(CustomFieldModelFilterForm):
427427
field_groups = [
428428
['q', 'tag'],
429429
['region', 'sitegroup', 'site', 'location', 'rack']
@@ -467,7 +467,7 @@ class VLANGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
467467
tag = TagFilterField(model)
468468

469469

470-
class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterForm):
470+
class VLANFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
471471
model = VLAN
472472
field_groups = [
473473
['q', 'tag'],
@@ -531,7 +531,7 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldModelFilterFo
531531
tag = TagFilterField(model)
532532

533533

534-
class ServiceFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
534+
class ServiceFilterForm(CustomFieldModelFilterForm):
535535
model = Service
536536
field_groups = (
537537
('q', 'tag'),

‎netbox/tenancy/forms/filtersets.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Tenants
1919
#
2020

21-
class TenantGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
21+
class TenantGroupFilterForm(CustomFieldModelFilterForm):
2222
model = TenantGroup
2323
q = forms.CharField(
2424
required=False,
@@ -34,7 +34,7 @@ class TenantGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
3434
tag = TagFilterField(model)
3535

3636

37-
class TenantFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
37+
class TenantFilterForm(CustomFieldModelFilterForm):
3838
model = Tenant
3939
field_groups = (
4040
('q', 'tag'),
@@ -59,7 +59,7 @@ class TenantFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
5959
# Contacts
6060
#
6161

62-
class ContactGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
62+
class ContactGroupFilterForm(CustomFieldModelFilterForm):
6363
model = ContactGroup
6464
q = forms.CharField(
6565
required=False,
@@ -75,7 +75,7 @@ class ContactGroupFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
7575
tag = TagFilterField(model)
7676

7777

78-
class ContactRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
78+
class ContactRoleFilterForm(CustomFieldModelFilterForm):
7979
model = ContactRole
8080
q = forms.CharField(
8181
required=False,
@@ -85,7 +85,7 @@ class ContactRoleFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
8585
tag = TagFilterField(model)
8686

8787

88-
class ContactFilterForm(BootstrapMixin, CustomFieldModelFilterForm):
88+
class ContactFilterForm(CustomFieldModelFilterForm):
8989
model = Contact
9090
field_groups = (
9191
('q', 'tag'),

0 commit comments

Comments
 (0)