Uncomment rack_group_id and add null option

This commit is contained in:
Joseph Kennedy 2017-08-31 17:45:33 -04:00
parent f37c14c0d2
commit a74b028f11

View File

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