From 94b7319370fcaea6fe926878fcc8aa13979841d4 Mon Sep 17 00:00:00 2001
From: Prince Kumar <pkumar@onemindservices.com>
Date: Wed, 18 Oct 2023 10:25:59 +0530
Subject: [PATCH] reverse the filtersets of device and vm

---
 netbox/dcim/forms/filtersets.py           | 7 ++-----
 netbox/virtualization/forms/filtersets.py | 7 +------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py
index ce600673c..7f99d1ca4 100644
--- a/netbox/dcim/forms/filtersets.py
+++ b/netbox/dcim/forms/filtersets.py
@@ -643,7 +643,7 @@ class DeviceFilterForm(
         (None, ('q', 'filter_id', 'tag')),
         (_('Location'), ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id')),
         (_('Operation'), ('status', 'role_id', 'airflow', 'serial', 'asset_tag', 'mac_address')),
-        (_('Hardware'), ('manufacturer_id', 'platform_id', 'device_type_id')),
+        (_('Hardware'), ('manufacturer_id', 'device_type_id', 'platform_id')),
         (_('Tenant'), ('tenant_group_id', 'tenant_id')),
         (_('Contacts'), ('contact', 'contact_role', 'contact_group')),
         (_('Components'), (
@@ -713,10 +713,7 @@ class DeviceFilterForm(
         queryset=Platform.objects.all(),
         required=False,
         null_option='None',
-        label=_('Platform'),
-        query_params={
-            "manufacturer_id": '$manufacturer_id'
-        }
+        label=_('Platform')
     )
     status = forms.MultipleChoiceField(
         label=_('Status'),
diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py
index 91d9f0375..009d67fad 100644
--- a/netbox/virtualization/forms/filtersets.py
+++ b/netbox/virtualization/forms/filtersets.py
@@ -94,7 +94,7 @@ class VirtualMachineFilterForm(
         (None, ('q', 'filter_id', 'tag')),
         (_('Cluster'), ('cluster_group_id', 'cluster_type_id', 'cluster_id', 'device_id')),
         (_('Location'), ('region_id', 'site_group_id', 'site_id')),
-        (_('Attributes'), ('status', 'role_id', 'manufacturer_id', 'platform_id', 'mac_address', 'has_primary_ip', 'config_template_id', 'local_context_data')),
+        (_('Attributes'), ('status', 'role_id', 'platform_id', 'mac_address', 'has_primary_ip', 'config_template_id', 'local_context_data')),
         (_('Tenant'), ('tenant_group_id', 'tenant_id')),
         (_('Contacts'), ('contact', 'contact_role', 'contact_group')),
     )
@@ -154,11 +154,6 @@ class VirtualMachineFilterForm(
         choices=VirtualMachineStatusChoices,
         required=False
     )
-    manufacturer_id = DynamicModelMultipleChoiceField(
-        queryset=Manufacturer.objects.all(),
-        required=False,
-        label=_('Manufacturer'),
-    )
     platform_id = DynamicModelMultipleChoiceField(
         queryset=Platform.objects.all(),
         required=False,