Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions netbox/ipam/filtersets.py
Original file line number Diff line number Diff line change
Expand Up @@ -946,28 +946,28 @@
@register_filterset
class VLANGroupFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
scope_type = MultiValueContentTypeFilter()
region = django_filters.NumberFilter(
region = MultiValueNumberFilter(
method='filter_scope'
)
site_group = django_filters.NumberFilter(
site_group = MultiValueNumberFilter(
method='filter_scope'
)
site = django_filters.NumberFilter(
site = MultiValueNumberFilter(
method='filter_scope'
)
location = django_filters.NumberFilter(
location = MultiValueNumberFilter(
method='filter_scope'
)
rack_group = django_filters.NumberFilter(
rack_group = MultiValueNumberFilter(
method='filter_scope'
)
rack = django_filters.NumberFilter(
rack = MultiValueNumberFilter(
method='filter_scope'
)
cluster_group = django_filters.NumberFilter(
cluster_group = MultiValueNumberFilter(
method='filter_scope'
)
cluster = django_filters.NumberFilter(
cluster = MultiValueNumberFilter(
method='filter_scope'
)
contains_vid = django_filters.NumberFilter(
Expand All @@ -990,9 +990,11 @@

def filter_scope(self, queryset, name, value):
model_name = name.replace('_', '')
if not isinstance(value, (list, tuple, set)):
value = [value]
return queryset.filter(
scope_type=ContentType.objects.get(model=model_name),
scope_id=value
scope_id__in=value
)


Expand Down Expand Up @@ -1343,4 +1345,4 @@
distinct=False,
to_field_name='address',
label=_('Primary IPv6 (address)'),
)
)

Check failure on line 1348 in netbox/ipam/filtersets.py

View workflow job for this annotation

GitHub Actions / Lint (Python)

ruff (missing-newline-at-end-of-file)

netbox/ipam/filtersets.py:1348:6: missing-newline-at-end-of-file: No newline at end of file help: Add trailing newline
Loading