NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 00:28:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Remove device filter field and mac_address field (now in search). Change site filter

Browse Source
This commit is contained in:
Joseph Kennedy 2017-08-30 20:25:53 -04:00
parent b835434a0b
commit 67f1a50393
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/dcim/filters.py
View File

@ -611,15 +611,21 @@ class InterfaceListFilter(django_filters.FilterSet):
to_field_name='slug', to_field_name='slug',
label='Site 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( type = django_filters.CharFilter(
method='filter_type', method='filter_type',
label='Interface type', label='Interface type',
) )
lag_id = django_filters.ModelMultipleChoiceFilter(
name='lag',
queryset=Interface.objects.all(),
label='LAG interface (ID)',
)
mac_address = django_filters.CharFilter( mac_address = django_filters.CharFilter(
method='_mac_address', method='_mac_address',
label='MAC address', label='MAC address',

12
netbox/dcim/forms.py
View File

@ -1620,19 +1620,17 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form):
class InterfaceListFilterForm(BootstrapMixin, forms.Form): class InterfaceListFilterForm(BootstrapMixin, forms.Form):
model = Interface model = Interface
q = forms.CharField(required=False, label='Search') q = forms.CharField(required=False, label='Search')
site = FilterChoiceField( site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug')
queryset=Site.objects.annotate(filter_count=Count('devices')), #site = FilterChoiceField(
to_field_name='slug' # 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')
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,
queryset=DeviceRole.objects.annotate(filter_count=Count('devices')), queryset=DeviceRole.objects.annotate(filter_count=Count('devices')),
to_field_name='slug' to_field_name='slug'
) )
mac_address = forms.CharField(required=False, label='MAC address')
# #