From cd3b3768676b0d3a7231d75f0afd5b285f043db6 Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Thu, 14 Nov 2024 15:47:55 -0800
Subject: [PATCH] 12596 review changes

---
 netbox/dcim/filterset_mixins.py     | 67 -----------------------------
 netbox/ipam/filtersets.py           |  2 +-
 netbox/virtualization/filtersets.py |  2 +-
 netbox/wireless/filtersets.py       |  2 +-
 4 files changed, 3 insertions(+), 70 deletions(-)
 delete mode 100644 netbox/dcim/filterset_mixins.py

diff --git a/netbox/dcim/filterset_mixins.py b/netbox/dcim/filterset_mixins.py
deleted file mode 100644
index c007c0120..000000000
--- a/netbox/dcim/filterset_mixins.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import django_filters
-
-from django.utils.translation import gettext as _
-from netbox.filtersets import BaseFilterSet
-from utilities.filters import ContentTypeFilter, TreeNodeMultipleChoiceFilter
-from .models import *
-
-__all__ = (
-    'ScopedFilterSet',
-)
-
-
-class ScopedFilterSet(BaseFilterSet):
-    """
-    Provides additional filtering functionality for location, site, etc.. for Scoped models.
-    """
-    scope_type = ContentTypeFilter()
-    region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
-        field_name='_region',
-        lookup_expr='in',
-        label=_('Region (ID)'),
-    )
-    region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
-        field_name='_region',
-        lookup_expr='in',
-        to_field_name='slug',
-        label=_('Region (slug)'),
-    )
-    site_group_id = TreeNodeMultipleChoiceFilter(
-        queryset=SiteGroup.objects.all(),
-        field_name='_site_group',
-        lookup_expr='in',
-        label=_('Site group (ID)'),
-    )
-    site_group = TreeNodeMultipleChoiceFilter(
-        queryset=SiteGroup.objects.all(),
-        field_name='_site_group',
-        lookup_expr='in',
-        to_field_name='slug',
-        label=_('Site group (slug)'),
-    )
-    site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
-        field_name='_site',
-        label=_('Site (ID)'),
-    )
-    site = django_filters.ModelMultipleChoiceFilter(
-        field_name='_site__slug',
-        queryset=Site.objects.all(),
-        to_field_name='slug',
-        label=_('Site (slug)'),
-    )
-    location_id = TreeNodeMultipleChoiceFilter(
-       queryset=Location.objects.all(),
-       field_name='_location',
-       lookup_expr='in',
-       label=_('Location (ID)'),
-    )
-    location = TreeNodeMultipleChoiceFilter(
-        queryset=Location.objects.all(),
-        field_name='_location',
-        lookup_expr='in',
-        to_field_name='slug',
-        label=_('Location (slug)'),
-    )
diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py
index 5f908af64..c762c15fe 100644
--- a/netbox/ipam/filtersets.py
+++ b/netbox/ipam/filtersets.py
@@ -1,6 +1,6 @@
 import django_filters
 import netaddr
-from dcim.filterset_mixins import ScopedFilterSet
+from dcim.base_filtersets import ScopedFilterSet
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db.models import Q
diff --git a/netbox/virtualization/filtersets.py b/netbox/virtualization/filtersets.py
index dbcc15a72..ab25492b5 100644
--- a/netbox/virtualization/filtersets.py
+++ b/netbox/virtualization/filtersets.py
@@ -3,7 +3,7 @@ from django.db.models import Q
 from django.utils.translation import gettext as _
 
 from dcim.filtersets import CommonInterfaceFilterSet
-from dcim.filterset_mixins import ScopedFilterSet
+from dcim.base_filtersets import ScopedFilterSet
 from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup
 from extras.filtersets import LocalConfigContextFilterSet
 from extras.models import ConfigTemplate
diff --git a/netbox/wireless/filtersets.py b/netbox/wireless/filtersets.py
index f08155a5a..cc5aefbd8 100644
--- a/netbox/wireless/filtersets.py
+++ b/netbox/wireless/filtersets.py
@@ -2,7 +2,7 @@ import django_filters
 from django.db.models import Q
 
 from dcim.choices import LinkStatusChoices
-from dcim.filterset_mixins import ScopedFilterSet
+from dcim.base_filtersets import ScopedFilterSet
 from dcim.models import Interface
 from ipam.models import VLAN
 from netbox.filtersets import OrganizationalModelFilterSet, NetBoxModelFilterSet