From 67f1a503933c4f8a18c13061404572eb00367cad Mon Sep 17 00:00:00 2001
From: Joseph Kennedy <joseph@netsiphon.com>
Date: Wed, 30 Aug 2017 20:25:53 -0400
Subject: [PATCH] Remove device filter field and mac_address field (now in
 search). Change site filter

---
 netbox/dcim/filters.py | 16 +++++++++++-----
 netbox/dcim/forms.py   | 12 +++++-------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 1bc4c558f..d588d7e54 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -611,15 +611,21 @@ class InterfaceListFilter(django_filters.FilterSet):
         to_field_name='slug',
         label='Site name (slug)',
     )
+    role_id = django_filters.ModelMultipleChoiceFilter(
+        name='device_role_id',
+        queryset=DeviceRole.objects.all(),
+        label='Role (ID)',
+    )
+    role = django_filters.ModelMultipleChoiceFilter(
+        name='device_role__slug',
+        queryset=DeviceRole.objects.all(),
+        to_field_name='slug',
+        label='Role (slug)',
+    )
     type = django_filters.CharFilter(
         method='filter_type',
         label='Interface type',
     )
-    lag_id = django_filters.ModelMultipleChoiceFilter(
-        name='lag',
-        queryset=Interface.objects.all(),
-        label='LAG interface (ID)',
-    )
     mac_address = django_filters.CharFilter(
         method='_mac_address',
         label='MAC address',
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 62d44014d..ef8ab68fe 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1620,19 +1620,17 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form):
 class InterfaceListFilterForm(BootstrapMixin, forms.Form):
     model = Interface
     q = forms.CharField(required=False, label='Search')
-    site = FilterChoiceField(
-        queryset=Site.objects.annotate(filter_count=Count('devices')),
-        to_field_name='slug'
-    )
-    #device = forms.ModelChoiceField(required=False, queryset=Device.objects.all(), to_field_name='slug')
-    device = forms.CharField(required=False, label='Device name')
+    site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug')
+    #site = FilterChoiceField(
+    #    queryset=Site.objects.annotate(filter_count=Count('devices')),
+    #    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'
     )
-    mac_address = forms.CharField(required=False, label='MAC address')
 
 
 #