From b6a981895a298f2b66cf6ac63b23d69cc9c0e451 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Tue, 20 Feb 2024 08:12:16 -0600 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Jeremy Stretch --- netbox/dcim/filtersets.py | 11 ----------- netbox/dcim/forms/model_forms.py | 2 +- netbox/dcim/tests/test_filtersets.py | 5 ----- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index c660e0e13..d0163e988 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -824,10 +824,6 @@ class PlatformFilterSet(OrganizationalModelFilterSet): queryset=DeviceType.objects.all(), method='get_for_device_type' ) - available_for_manufacturer = django_filters.ModelChoiceFilter( - queryset=Manufacturer.objects.all(), - method='get_for_manufacturer' - ) config_template_id = django_filters.ModelMultipleChoiceFilter( queryset=ConfigTemplate.objects.all(), label=_('Config template (ID)'), @@ -845,13 +841,6 @@ class PlatformFilterSet(OrganizationalModelFilterSet): """ return queryset.filter(Q(manufacturer=None) | Q(manufacturer__device_types=value)) - @extend_schema_field(OpenApiTypes.STR) - def get_for_manufacturer(self, queryset, name, value): - """ - Return all Platforms available for a specific manufacturer and Platforms not assigned any manufacturer - """ - return queryset.filter(Q(manufacturer=None) | Q(**{f'manufacturer': value})) - class DeviceFilterSet( NetBoxModelFilterSet, diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index e472ba841..6773bc55f 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -294,7 +294,7 @@ class DeviceTypeForm(NetBoxModelForm): required=False, selector=True, query_params={ - 'available_for_manufacturer': '$manufacturer', + 'manufacturer_id': ['$manufacturer', 'null'], } ) slug = SlugField( diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index 50dd8ed6e..b255c283e 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -1825,11 +1825,6 @@ class PlatformTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'available_for_device_type': device_type.pk} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - def test_available_for_manufacturer(self): - manufacturer = Manufacturer.objects.first() - params = {'available_for_manufacturer': manufacturer.pk} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) - class DeviceTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = Device.objects.all()