mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

#9061 - Change inheritance order for DeviceComponentFilterSets

Browse Source
This commit is contained in:
Daniel Sheppard
2022-04-06 13:35:22 -05:00
parent ea197eff5f
commit 523390cd8e
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/release-notes/version-3.2.md
View File

@ -2,6 +2,11 @@
## v3.2.1 (FUTURE) ## v3.2.1 (FUTURE)
### Bug Fixes (From Beta2)
* [#9061](https://github.com/netbox-community/netbox/issues/9061) - Change inheritance order for DeviceComponentFilterSets
--- ---
## v3.2.0 (2022-04-05) ## v3.2.0 (2022-04-05)

20
netbox/dcim/filtersets.py
View File

@ -1095,8 +1095,8 @@ class PathEndpointFilterSet(django_filters.FilterSet):
class ConsolePortFilterSet( class ConsolePortFilterSet(
NetBoxModelFilterSet,
ModularDeviceComponentFilterSet, ModularDeviceComponentFilterSet,
NetBoxModelFilterSet,
CableTerminationFilterSet, CableTerminationFilterSet,
PathEndpointFilterSet PathEndpointFilterSet
): ):
@ -1111,8 +1111,8 @@ class ConsolePortFilterSet(
class ConsoleServerPortFilterSet( class ConsoleServerPortFilterSet(
NetBoxModelFilterSet,
ModularDeviceComponentFilterSet, ModularDeviceComponentFilterSet,
NetBoxModelFilterSet,
CableTerminationFilterSet, CableTerminationFilterSet,
PathEndpointFilterSet PathEndpointFilterSet
): ):
@ -1127,8 +1127,8 @@ class ConsoleServerPortFilterSet(
class PowerPortFilterSet( class PowerPortFilterSet(
NetBoxModelFilterSet,
ModularDeviceComponentFilterSet, ModularDeviceComponentFilterSet,
NetBoxModelFilterSet,
CableTerminationFilterSet, CableTerminationFilterSet,
PathEndpointFilterSet PathEndpointFilterSet
): ):
@ -1143,8 +1143,8 @@ class PowerPortFilterSet(
class PowerOutletFilterSet( class PowerOutletFilterSet(
NetBoxModelFilterSet,
ModularDeviceComponentFilterSet, ModularDeviceComponentFilterSet,
NetBoxModelFilterSet,
CableTerminationFilterSet, CableTerminationFilterSet,
PathEndpointFilterSet PathEndpointFilterSet
): ):
@ -1163,8 +1163,8 @@ class PowerOutletFilterSet(
class InterfaceFilterSet( class InterfaceFilterSet(
NetBoxModelFilterSet,
ModularDeviceComponentFilterSet, ModularDeviceComponentFilterSet,
NetBoxModelFilterSet,
CableTerminationFilterSet, CableTerminationFilterSet,
PathEndpointFilterSet PathEndpointFilterSet
): ):
@ -1291,8 +1291,8 @@ class InterfaceFilterSet(
class FrontPortFilterSet( class FrontPortFilterSet(
NetBoxModelFilterSet,
ModularDeviceComponentFilterSet, ModularDeviceComponentFilterSet,
NetBoxModelFilterSet,
CableTerminationFilterSet CableTerminationFilterSet
): ):
type = django_filters.MultipleChoiceFilter( type = django_filters.MultipleChoiceFilter(
@ -1306,8 +1306,8 @@ class FrontPortFilterSet(
class RearPortFilterSet( class RearPortFilterSet(
NetBoxModelFilterSet,
ModularDeviceComponentFilterSet, ModularDeviceComponentFilterSet,
NetBoxModelFilterSet,
CableTerminationFilterSet CableTerminationFilterSet
): ):
type = django_filters.MultipleChoiceFilter( type = django_filters.MultipleChoiceFilter(
@ -1320,21 +1320,21 @@ class RearPortFilterSet(
fields = ['id', 'name', 'label', 'type', 'color', 'positions', 'description'] fields = ['id', 'name', 'label', 'type', 'color', 'positions', 'description']
class ModuleBayFilterSet(NetBoxModelFilterSet, DeviceComponentFilterSet): class ModuleBayFilterSet(DeviceComponentFilterSet, NetBoxModelFilterSet):
class Meta: class Meta:
model = ModuleBay model = ModuleBay
fields = ['id', 'name', 'label', 'description'] fields = ['id', 'name', 'label', 'description']
class DeviceBayFilterSet(NetBoxModelFilterSet, DeviceComponentFilterSet): class DeviceBayFilterSet(DeviceComponentFilterSet, NetBoxModelFilterSet):
class Meta: class Meta:
model = DeviceBay model = DeviceBay
fields = ['id', 'name', 'label', 'description'] fields = ['id', 'name', 'label', 'description']
class InventoryItemFilterSet(NetBoxModelFilterSet, DeviceComponentFilterSet): class InventoryItemFilterSet(DeviceComponentFilterSet, NetBoxModelFilterSet):
parent_id = django_filters.ModelMultipleChoiceFilter( parent_id = django_filters.ModelMultipleChoiceFilter(
queryset=InventoryItem.objects.all(), queryset=InventoryItem.objects.all(),
label='Parent inventory item (ID)', label='Parent inventory item (ID)',