diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py index ea3831455..e2d5321cd 100644 --- a/netbox/circuits/filters.py +++ b/netbox/circuits/filters.py @@ -83,7 +83,7 @@ class CircuitFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant', + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 6c4095365..6316cad4e 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -26,6 +26,7 @@ class RegionFilter(django_filters.FilterSet): label='Parent region (ID)', ) parent = django_filters.ModelMultipleChoiceFilter( + name='parent__slug', queryset=Region.objects.all(), to_field_name='slug', label='Parent region (slug)', @@ -47,6 +48,7 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Region (ID)', ) region = django_filters.ModelMultipleChoiceFilter( + name='region__slug', queryset=Region.objects.all(), to_field_name='slug', label='Region (slug)', @@ -56,6 +58,7 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -131,7 +134,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='group', + name='group__slug', queryset=RackGroup.objects.all(), to_field_name='slug', label='Group', @@ -141,7 +144,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant', + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -151,7 +154,7 @@ class RackFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='role', + name='role__slug', queryset=RackRole.objects.all(), to_field_name='slug', label='Role (slug)', @@ -199,7 +202,7 @@ class RackReservationFilter(django_filters.FilterSet): label='Group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='rack__group', + name='rack__group__slug', queryset=RackGroup.objects.all(), to_field_name='slug', label='Group', @@ -373,7 +376,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant', + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -383,7 +386,7 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Platform (ID)', ) platform = django_filters.ModelMultipleChoiceFilter( - name='platform', + name='platform__slug', queryset=Platform.objects.all(), to_field_name='slug', label='Platform (slug)', diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py index d6ce6b987..23a7bdfa5 100644 --- a/netbox/ipam/filters.py +++ b/netbox/ipam/filters.py @@ -28,7 +28,7 @@ class VRFFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant', + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -115,7 +115,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='VRF', ) vrf = django_filters.ModelMultipleChoiceFilter( - name='vrf', + name='vrf__rd', queryset=VRF.objects.all(), to_field_name='rd', label='VRF (RD)', @@ -125,7 +125,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant', + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -135,7 +135,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site', + name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -153,7 +153,7 @@ class PrefixFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='role', + name='role__slug', queryset=Role.objects.all(), to_field_name='slug', label='Role (slug)', @@ -212,7 +212,7 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet): label='VRF', ) vrf = django_filters.ModelMultipleChoiceFilter( - name='vrf', + name='vrf__rd', queryset=VRF.objects.all(), to_field_name='rd', label='VRF (RD)', @@ -222,7 +222,7 @@ class IPAddressFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant', + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -295,7 +295,7 @@ class VLANGroupFilter(django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site', + name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -317,7 +317,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Site (ID)', ) site = django_filters.ModelMultipleChoiceFilter( - name='site', + name='site__slug', queryset=Site.objects.all(), to_field_name='slug', label='Site (slug)', @@ -327,7 +327,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='group', + name='group__slug', queryset=VLANGroup.objects.all(), to_field_name='slug', label='Group', @@ -337,7 +337,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( - name='tenant', + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -347,7 +347,7 @@ class VLANFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( - name='role', + name='role__slug', queryset=Role.objects.all(), to_field_name='slug', label='Role (slug)', diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py index 275d998e2..090a0f9ee 100644 --- a/netbox/tenancy/filters.py +++ b/netbox/tenancy/filters.py @@ -27,7 +27,7 @@ class TenantFilter(CustomFieldFilterSet, django_filters.FilterSet): label='Group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( - name='group', + name='group__slug', queryset=TenantGroup.objects.all(), to_field_name='slug', label='Group (slug)', diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py index 123cd30af..c661bc973 100644 --- a/netbox/virtualization/filters.py +++ b/netbox/virtualization/filters.py @@ -25,6 +25,7 @@ class ClusterFilter(CustomFieldFilterSet): label='Parent group (ID)', ) group = django_filters.ModelMultipleChoiceFilter( + name='group__slug', queryset=ClusterGroup.objects.all(), to_field_name='slug', label='Parent group (slug)', @@ -78,7 +79,7 @@ class VirtualMachineFilter(CustomFieldFilterSet): label='Cluster group (ID)', ) cluster_group = django_filters.ModelMultipleChoiceFilter( - name='cluster__group', + name='cluster__group__slug', queryset=ClusterGroup.objects.all(), to_field_name='slug', label='Cluster group (slug)', @@ -92,6 +93,7 @@ class VirtualMachineFilter(CustomFieldFilterSet): label='Role (ID)', ) role = django_filters.ModelMultipleChoiceFilter( + name='role__slug', queryset=DeviceRole.objects.all(), to_field_name='slug', label='Role (slug)', @@ -101,6 +103,7 @@ class VirtualMachineFilter(CustomFieldFilterSet): label='Tenant (ID)', ) tenant = django_filters.ModelMultipleChoiceFilter( + name='tenant__slug', queryset=Tenant.objects.all(), to_field_name='slug', label='Tenant (slug)', @@ -110,6 +113,7 @@ class VirtualMachineFilter(CustomFieldFilterSet): label='Platform (ID)', ) platform = django_filters.ModelMultipleChoiceFilter( + name='platform__slug', queryset=Platform.objects.all(), to_field_name='slug', label='Platform (slug)',