diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index fafccc90f..77b0bf2bc 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1620,17 +1620,17 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form): class InterfaceListFilterForm(BootstrapMixin, forms.Form): q = forms.CharField(required=False, label='Search') site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug') - #rack_group_id = forms.FilterChoiceFieldField( - # required=False, - # queryset=RackGroup.objects.select_related('site').annotate(filter_count=Count('racks__devices')), - # label='Rack group' - #) + rack_group_id = forms.FilterChoiceFieldField( + required=False, + queryset=RackGroup.objects.select_related('site').annotate(filter_count=Count('racks__devices')), + label='Rack group', + null_option=(None, 'None') + ) rack_id = FilterChoiceField( required=False, queryset=Rack.objects.annotate(filter_count=Count('devices')), label='Rack', - null_option=(None, 'None'), - empty_label='--------' + null_option=(None, 'None') ) enabled = forms.ChoiceField(choices=add_blank_choice(IFACE_ENABLED_CHOICES), required=False) role = FilterChoiceField(