|
|
@@ -1,6 +1,5 @@
|
|
|
import django_filters
|
|
|
from django.contrib.auth.models import User
|
|
|
-from django.core.exceptions import ObjectDoesNotExist
|
|
|
from django.db.models import Q
|
|
|
|
|
|
from extras.filters import CustomFieldFilterSet, LocalConfigContextFilter
|
|
|
@@ -931,13 +930,28 @@ class CableFilter(django_filters.FilterSet):
|
|
|
color = django_filters.MultipleChoiceFilter(
|
|
|
choices=COLOR_CHOICES
|
|
|
)
|
|
|
- device = django_filters.CharFilter(
|
|
|
- method='filter_connected_device',
|
|
|
- field_name='name'
|
|
|
+ device_id = MultiValueNumberFilter(
|
|
|
+ method='filter_device'
|
|
|
+ )
|
|
|
+ device = MultiValueNumberFilter(
|
|
|
+ method='filter_device',
|
|
|
+ field_name='device__name'
|
|
|
+ )
|
|
|
+ rack_id = MultiValueNumberFilter(
|
|
|
+ method='filter_device',
|
|
|
+ field_name='device__rack_id'
|
|
|
+ )
|
|
|
+ rack = MultiValueNumberFilter(
|
|
|
+ method='filter_device',
|
|
|
+ field_name='device__rack__name'
|
|
|
+ )
|
|
|
+ site_id = MultiValueNumberFilter(
|
|
|
+ method='filter_device',
|
|
|
+ field_name='device__site_id'
|
|
|
)
|
|
|
- device_id = django_filters.CharFilter(
|
|
|
- method='filter_connected_device',
|
|
|
- field_name='pk'
|
|
|
+ site = MultiValueNumberFilter(
|
|
|
+ method='filter_device',
|
|
|
+ field_name='device__site__name'
|
|
|
)
|
|
|
|
|
|
class Meta:
|
|
|
@@ -949,15 +963,12 @@ class CableFilter(django_filters.FilterSet):
|
|
|
return queryset
|
|
|
return queryset.filter(label__icontains=value)
|
|
|
|
|
|
- def filter_connected_device(self, queryset, name, value):
|
|
|
- if not value.strip():
|
|
|
- return queryset
|
|
|
- try:
|
|
|
- device = Device.objects.get(**{name: value})
|
|
|
- except ObjectDoesNotExist:
|
|
|
- return queryset.none()
|
|
|
- cable_pks = device.get_cables(pk_list=True)
|
|
|
- return queryset.filter(pk__in=cable_pks)
|
|
|
+ def filter_device(self, queryset, name, value):
|
|
|
+ queryset = queryset.filter(
|
|
|
+ Q(**{'_termination_a_{}__in'.format(name): value}) |
|
|
|
+ Q(**{'_termination_b_{}__in'.format(name): value})
|
|
|
+ )
|
|
|
+ return queryset
|
|
|
|
|
|
|
|
|
class ConsoleConnectionFilter(django_filters.FilterSet):
|
Jeremy Stretch