NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixes #3827: Allow filtering console/power/interface connections by device ID

Browse Source
This commit is contained in:
Jeremy Stretch 2020-01-02 13:44:18 -05:00
parent 523a1388db
commit 80d1f80b61
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.6.md
View File

@ -10,6 +10,7 @@
* [#3762](https://github.com/netbox-community/netbox/issues/3762) - Add date/time picker widgets * [#3762](https://github.com/netbox-community/netbox/issues/3762) - Add date/time picker widgets
* [#3788](https://github.com/netbox-community/netbox/issues/3788) - Enable partial search for inventory items * [#3788](https://github.com/netbox-community/netbox/issues/3788) - Enable partial search for inventory items
* [#3812](https://github.com/netbox-community/netbox/issues/3812) - Optimize size of pages containing a dynamic selection field * [#3812](https://github.com/netbox-community/netbox/issues/3812) - Optimize size of pages containing a dynamic selection field
* [#3827](https://github.com/netbox-community/netbox/issues/3827) - Allow filtering console/power/interface connections by device ID
## Bug Fixes ## Bug Fixes

39
netbox/dcim/filters.py
View File

@ -978,9 +978,12 @@ class ConsoleConnectionFilter(django_filters.FilterSet):
method='filter_site', method='filter_site',
label='Site (slug)', label='Site (slug)',
) )
device = django_filters.CharFilter( device_id = MultiValueNumberFilter(
method='filter_device'
)
device = MultiValueCharFilter(
method='filter_device', method='filter_device',
label='Device', field_name='device__name'
) )
class Meta: class Meta:
@ -993,11 +996,11 @@ class ConsoleConnectionFilter(django_filters.FilterSet):
return queryset.filter(connected_endpoint__device__site__slug=value) return queryset.filter(connected_endpoint__device__site__slug=value)
def filter_device(self, queryset, name, value): def filter_device(self, queryset, name, value):
if not value.strip(): if not value:
return queryset return queryset
return queryset.filter( return queryset.filter(
Q(device__name__icontains=value) | Q(**{'{}__in'.format(name): value}) |
Q(connected_endpoint__device__name__icontains=value) Q(**{'connected_endpoint__{}__in'.format(name): value})
) )
@ -1006,9 +1009,12 @@ class PowerConnectionFilter(django_filters.FilterSet):
method='filter_site', method='filter_site',
label='Site (slug)', label='Site (slug)',
) )
device = django_filters.CharFilter( device_id = MultiValueNumberFilter(
method='filter_device'
)
device = MultiValueCharFilter(
method='filter_device', method='filter_device',
label='Device', field_name='device__name'
) )
class Meta: class Meta:
@ -1021,11 +1027,11 @@ class PowerConnectionFilter(django_filters.FilterSet):
return queryset.filter(_connected_poweroutlet__device__site__slug=value) return queryset.filter(_connected_poweroutlet__device__site__slug=value)
def filter_device(self, queryset, name, value): def filter_device(self, queryset, name, value):
if not value.strip(): if not value:
return queryset return queryset
return queryset.filter( return queryset.filter(
Q(device__name__icontains=value) | Q(**{'{}__in'.format(name): value}) |
Q(_connected_poweroutlet__device__name__icontains=value) Q(**{'_connected_poweroutlet__{}__in'.format(name): value})
) )
@ -1034,9 +1040,12 @@ class InterfaceConnectionFilter(django_filters.FilterSet):
method='filter_site', method='filter_site',
label='Site (slug)', label='Site (slug)',
) )
device = django_filters.CharFilter( device_id = MultiValueNumberFilter(
method='filter_device'
)
device = MultiValueCharFilter(
method='filter_device', method='filter_device',
label='Device', field_name='device__name'
) )
class Meta: class Meta:
@ -1052,11 +1061,11 @@ class InterfaceConnectionFilter(django_filters.FilterSet):
) )
def filter_device(self, queryset, name, value): def filter_device(self, queryset, name, value):
if not value.strip(): if not value:
return queryset return queryset
return queryset.filter( return queryset.filter(
Q(device__name__icontains=value) | Q(**{'{}__in'.format(name): value}) |
Q(_connected_interface__device__name__icontains=value) Q(**{'_connected_interface__{}__in'.format(name): value})
) )