Remove device filter

This commit is contained in:
Joseph Kennedy 2017-08-31 15:43:32 -04:00
parent 6f1240bc73
commit d7f52bc24b
2 changed files with 0 additions and 15 deletions

View File

@ -582,15 +582,6 @@ class InterfaceListFilter(django_filters.FilterSet):
method='search', method='search',
label='Search', label='Search',
) )
device = django_filters.CharFilter(
method='filter_device',
label='Device',
)
#site_id = django_filters.ModelMultipleChoiceFilter(
# name='site',
# method='_filter_site',
# label='Site (ID)',
#)
site = django_filters.CharFilter( site = django_filters.CharFilter(
method='filter_site', method='filter_site',
label='Site (slug)', label='Site (slug)',
@ -630,11 +621,6 @@ class InterfaceListFilter(django_filters.FilterSet):
except Device.DoesNotExist: except Device.DoesNotExist:
return queryset.none() return queryset.none()
def filter_device(self, queryset, name, value):
if not value.strip():
return queryset
return queryset.filter(device__name__icontains=value)
def filter_type(self, queryset, name, value): def filter_type(self, queryset, name, value):
value = value.strip().lower() value = value.strip().lower()
return { return {

View File

@ -1620,7 +1620,6 @@ 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')
device = forms.CharField(required=False, label='Device name')
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(
# required=False, # required=False,