Fixes #2558: Filter on all tags when multiple are passed

This commit is contained in:
Jeremy Stretch
2018-11-12 15:48:58 -05:00
parent cbdd0e3678
commit 574ddedc22
8 changed files with 42 additions and 63 deletions

View File

@@ -9,7 +9,7 @@ from netaddr.core import AddrFormatError
from dcim.models import DeviceRole, Interface, Platform, Region, Site
from extras.filters import CustomFieldFilterSet
from tenancy.models import Tenant
from utilities.filters import NumericInFilter
from utilities.filters import NumericInFilter, TagFilter
from .constants import VM_STATUS_CHOICES
from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
@@ -64,9 +64,7 @@ class ClusterFilter(CustomFieldFilterSet):
to_field_name='slug',
label='Site (slug)',
)
tag = django_filters.CharFilter(
name='tags__slug',
)
tag = TagFilter()
class Meta:
model = Cluster
@@ -168,9 +166,7 @@ class VirtualMachineFilter(CustomFieldFilterSet):
to_field_name='slug',
label='Platform (slug)',
)
tag = django_filters.CharFilter(
name='tags__slug',
)
tag = TagFilter()
class Meta:
model = VirtualMachine