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

Change site field to ModelChoiceField

Browse Source
This commit is contained in:
Joseph Kennedy 2017-08-30 21:30:16 -04:00
parent 5b7cb8eb4f
commit 3b18ec571c
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/filters.py
View File

@ -617,7 +617,7 @@ class InterfaceListFilter(django_filters.FilterSet):
try: try:
device = Device.objects.select_related('site').get(**{name: value}) device = Device.objects.select_related('site').get(**{name: value})
ordering = device.site.interface_ordering ordering = device.site.interface_ordering
return queryset.filter(device=device).order_naturally(ordering) return queryset.filter(site=site).order_naturally(ordering)
except Device.DoesNotExist: except Device.DoesNotExist:
return queryset.none() return queryset.none()

15
netbox/dcim/forms.py
View File

@ -1619,16 +1619,13 @@ 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 = FilterChoiceField( site = forms.ModelChoiceField(required=False, queryset=Site.objects.all(), to_field_name='slug')
queryset=Site.objects.annotate(filter_count=Count('devices')),
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('devices')), # queryset=DeviceRole.objects.annotate(filter_count=Count('devices')),
to_field_name='slug' # to_field_name='slug'
) #)
# #