NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-28 11:26:26 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Clean up filtersets

Browse Source
This commit is contained in:
jeremystretch 2021-11-03 16:58:31 -04:00
parent d5beaad74f
commit 24dc612950
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/filtersets.py
View File

@ -173,7 +173,7 @@ class SiteFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
return queryset.filter(qs_filter) return queryset.filter(qs_filter)
class LocationFilterSet(OrganizationalModelFilterSet): class LocationFilterSet(TenancyFilterSet, OrganizationalModelFilterSet):
region_id = TreeNodeMultipleChoiceFilter( region_id = TreeNodeMultipleChoiceFilter(
queryset=Region.objects.all(), queryset=Region.objects.all(),
field_name='site__region', field_name='site__region',

4
netbox/ipam/filtersets.py
View File

@ -9,7 +9,6 @@ from dcim.models import Device, Interface, Region, Site, SiteGroup
from extras.filters import TagFilter from extras.filters import TagFilter
from netbox.filtersets import ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet from netbox.filtersets import ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, PrimaryModelFilterSet
from tenancy.filtersets import TenancyFilterSet from tenancy.filtersets import TenancyFilterSet
from tenancy.models import Tenant
from utilities.filters import ( from utilities.filters import (
ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, NumericArrayFilter, TreeNodeMultipleChoiceFilter, ContentTypeFilter, MultiValueCharFilter, MultiValueNumberFilter, NumericArrayFilter, TreeNodeMultipleChoiceFilter,
) )
@ -180,7 +179,6 @@ class AggregateFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
class ASNFilterSet(OrganizationalModelFilterSet, TenancyFilterSet): class ASNFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
rir_id = django_filters.ModelMultipleChoiceFilter( rir_id = django_filters.ModelMultipleChoiceFilter(
queryset=RIR.objects.all(), queryset=RIR.objects.all(),
label='RIR (ID)', label='RIR (ID)',
@ -210,7 +208,7 @@ class ASNFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
def search(self, queryset, name, value): def search(self, queryset, name, value):
if not value.strip(): if not value.strip():
return queryset return queryset
qs_filter = Q(Q(description__icontains=value) | Q(asn__icontains=value)) qs_filter = Q(description__icontains=value)
return queryset.filter(qs_filter) return queryset.filter(qs_filter)

4
netbox/wireless/filtersets.py
View File

@ -5,7 +5,7 @@ from dcim.choices import LinkStatusChoices
from extras.filters import TagFilter from extras.filters import TagFilter
from ipam.models import VLAN from ipam.models import VLAN
from netbox.filtersets import OrganizationalModelFilterSet, PrimaryModelFilterSet from netbox.filtersets import OrganizationalModelFilterSet, PrimaryModelFilterSet
from utilities.filters import TreeNodeMultipleChoiceFilter from utilities.filters import MultiValueNumberFilter, TreeNodeMultipleChoiceFilter
from .choices import * from .choices import *
from .models import * from .models import *
@ -78,6 +78,8 @@ class WirelessLinkFilterSet(PrimaryModelFilterSet):
method='search', method='search',
label='Search', label='Search',
) )
interface_a_id = MultiValueNumberFilter()
interface_b_id = MultiValueNumberFilter()
status = django_filters.MultipleChoiceFilter( status = django_filters.MultipleChoiceFilter(
choices=LinkStatusChoices choices=LinkStatusChoices
) )