From 5caa04ef2b821c4b7443529cd8ead7c499ed5574 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 31 Dec 2019 11:35:18 -0500 Subject: [PATCH] Fixes #3811: Fix filtering of racks by group on device list --- docs/release-notes/version-2.6.md | 1 + netbox/dcim/forms.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md index 3acbe6f09..fce50fbe4 100644 --- a/docs/release-notes/version-2.6.md +++ b/docs/release-notes/version-2.6.md @@ -12,6 +12,7 @@ * [#3712](https://github.com/netbox-community/netbox/issues/3712) - Scrolling to target (hash) did not account for the header size * [#3780](https://github.com/netbox-community/netbox/issues/3780) - Fix AttributeError exception in API docs * [#3809](https://github.com/netbox-community/netbox/issues/3809) - Filter platform by manufacturer when editing devices +* [#3811](https://github.com/netbox-community/netbox/issues/3811) - Fix filtering of racks by group on device list --- diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 7bbcc0122..1774fc986 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1729,7 +1729,7 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldFilterForm): model = Device field_order = [ - 'q', 'region', 'site', 'rack_group_id', 'rack_id', 'status', 'role', 'tenant_group', 'tenant', + 'q', 'region', 'site', 'group_id', 'rack_id', 'status', 'role', 'tenant_group', 'tenant', 'manufacturer_id', 'device_type_id', 'mac_address', 'has_primary_ip', ] q = forms.CharField( @@ -1755,12 +1755,12 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt api_url="/api/dcim/sites/", value_field="slug", filter_for={ - 'rack_group_id': 'site', + 'group_id': 'site', 'rack_id': 'site', } ) ) - rack_group_id = FilterChoiceField( + group_id = FilterChoiceField( queryset=RackGroup.objects.prefetch_related( 'site' ), @@ -1768,7 +1768,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt widget=APISelectMultiple( api_url="/api/dcim/rack-groups/", filter_for={ - 'rack_id': 'rack_group_id', + 'rack_id': 'group_id', } ) )