NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-15 19:52:52 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixes #3882: Fix filtering of devices by rack group

Browse Source
This commit is contained in:
Jeremy Stretch 2020-01-10 10:21:11 -05:00
parent fc1245c49d
commit 6bc8f2e50b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.6.md
View File

@ -26,6 +26,7 @@
* [#3864](https://github.com/netbox-community/netbox/issues/3864) - Disallow /0 masks * [#3864](https://github.com/netbox-community/netbox/issues/3864) - Disallow /0 masks
* [#3872](https://github.com/netbox-community/netbox/issues/3872) - Paginate related IPs of an address * [#3872](https://github.com/netbox-community/netbox/issues/3872) - Paginate related IPs of an address
* [#3876](https://github.com/netbox-community/netbox/issues/3876) - Fixed min/max to ASN input field at the site creation page * [#3876](https://github.com/netbox-community/netbox/issues/3876) - Fixed min/max to ASN input field at the site creation page
* [#3882](https://github.com/netbox-community/netbox/issues/3882) - Fix filtering of devices by rack group
--- ---

8
netbox/dcim/forms.py
View File

@ -739,7 +739,7 @@ class RackElevationFilterForm(RackFilterForm):
# Filter the rack field based on the site and group # Filter the rack field based on the site and group
self.fields['site'].widget.add_filter_for('id', 'site') self.fields['site'].widget.add_filter_for('id', 'site')
self.fields['group_id'].widget.add_filter_for('id', 'group_id') self.fields['rack_group_id'].widget.add_filter_for('id', 'group_id')
# #
@ -1791,7 +1791,7 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldFilterForm): class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilterForm, CustomFieldFilterForm):
model = Device model = Device
field_order = [ field_order = [
'q', 'region', 'site', 'group_id', 'rack_id', 'status', 'role', 'tenant_group', 'tenant', 'q', 'region', 'site', 'rack_group_id', 'rack_id', 'status', 'role', 'tenant_group', 'tenant',
'manufacturer_id', 'device_type_id', 'mac_address', 'has_primary_ip', 'manufacturer_id', 'device_type_id', 'mac_address', 'has_primary_ip',
] ]
q = forms.CharField( q = forms.CharField(
@ -1817,12 +1817,12 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
api_url="/api/dcim/sites/", api_url="/api/dcim/sites/",
value_field="slug", value_field="slug",
filter_for={ filter_for={
'group_id': 'site', 'rack_group_id': 'site',
'rack_id': 'site', 'rack_id': 'site',
} }
) )
) )
group_id = FilterChoiceField( rack_group_id = FilterChoiceField(
queryset=RackGroup.objects.prefetch_related( queryset=RackGroup.objects.prefetch_related(
'site' 'site'
), ),