From 3b18ec571c8750864fa97d7820ed3eb92b1e5514 Mon Sep 17 00:00:00 2001 From: Joseph Kennedy Date: Wed, 30 Aug 2017 21:30:16 -0400 Subject: [PATCH] Change site field to ModelChoiceField --- netbox/dcim/filters.py | 2 +- netbox/dcim/forms.py | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index f4a4ee22f..09d9e61f2 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -617,7 +617,7 @@ class InterfaceListFilter(django_filters.FilterSet): try: device = Device.objects.select_related('site').get(**{name: value}) ordering = device.site.interface_ordering - return queryset.filter(device=device).order_naturally(ordering) + return queryset.filter(site=site).order_naturally(ordering) except Device.DoesNotExist: return queryset.none() diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 96e9631b3..68ed5eb45 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -1619,16 +1619,13 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form): class InterfaceListFilterForm(BootstrapMixin, forms.Form): q = forms.CharField(required=False, label='Search') - site = FilterChoiceField( - queryset=Site.objects.annotate(filter_count=Count('devices')), - to_field_name='slug' - ) + site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug') enabled = forms.ChoiceField(choices=add_blank_choice(IFACE_ENABLED_CHOICES), required=False) - role = FilterChoiceField( - required=False, - queryset=DeviceRole.objects.annotate(filter_count=Count('devices')), - to_field_name='slug' - ) + #role = FilterChoiceField( + # required=False, + # queryset=DeviceRole.objects.annotate(filter_count=Count('devices')), + # to_field_name='slug' + #) #