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 model from InterfaceListFilter. Change annotations back

Browse Source
This commit is contained in:
Joseph Kennedy 2017-08-30 20:35:39 -04:00
parent 03ed8633fa
commit 433fcb15c3
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/dcim/forms.py
View File

@ -1618,16 +1618,15 @@ class InterfaceFilterForm(BootstrapMixin, forms.Form):
class InterfaceListFilterForm(BootstrapMixin, forms.Form): class InterfaceListFilterForm(BootstrapMixin, forms.Form):
model = Interface
q = forms.CharField(required=False, label='Search') q = forms.CharField(required=False, label='Search')
site = FilterChoiceField( site = FilterChoiceField(
queryset=Site.objects.annotate(filter_count=Count('member_interfaces')), queryset=Site.objects.annotate(filter_count=Count('devices')),
to_field_name='slug' to_field_name='slug'
) )
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('member_interfaces')), queryset=DeviceRole.objects.annotate(filter_count=Count('devices')),
to_field_name='slug' to_field_name='slug'
) )

1
netbox/dcim/tables.py
View File

@ -559,7 +559,6 @@ class InterfaceListTable(BaseTable):
device = tables.LinkColumn('dcim:device', accessor=Accessor('device'), device = tables.LinkColumn('dcim:device', accessor=Accessor('device'),
args=[Accessor('device.pk')], verbose_name='Device') args=[Accessor('device.pk')], verbose_name='Device')
name = tables.TemplateColumn(template_code=INTERFACE_LINK, verbose_name='Interface') name = tables.TemplateColumn(template_code=INTERFACE_LINK, verbose_name='Interface')
#name = tables.Column(verbose_name='Interface')
enabled = tables.TemplateColumn(template_code=INTERFACE_ENABLED, verbose_name='Enabled') enabled = tables.TemplateColumn(template_code=INTERFACE_ENABLED, verbose_name='Enabled')
form_factor = tables.Column(verbose_name='Form Factor') form_factor = tables.Column(verbose_name='Form Factor')
mac_address = tables.Column(verbose_name='MAC Address') mac_address = tables.Column(verbose_name='MAC Address')