mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into develop-2.5

Browse Source
This commit is contained in:
Jeremy Stretch
2018-11-12 16:03:52 -05:00
parent 59589fdd29 0c33af2140
commit bc8dbfde7c
18 changed files with 195 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/virtualization/filters.py
View File

@@ -7,7 +7,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
@@ -65,9 +65,7 @@ class ClusterFilter(CustomFieldFilterSet):
to_field_name='slug',
label='Site (slug)',
)
tag = django_filters.CharFilter(
field_name='tags__slug',
)
tag = TagFilter()
class Meta:
model = Cluster
@@ -172,9 +170,7 @@ class VirtualMachineFilter(CustomFieldFilterSet):
to_field_name='slug',
label='Platform (slug)',
)
tag = django_filters.CharFilter(
field_name='tags__slug',
)
tag = TagFilter()
class Meta:
model = VirtualMachine