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-2.7' into 3569-api-choice-slugs

Browse Source
This commit is contained in:
Jeremy Stretch
2019-12-05 17:43:11 -05:00
parent edbf562803 8cbd2f5c2d
commit 17898a4c57
27 changed files with 875 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/virtualization/filters.py
View File

@@ -4,9 +4,9 @@ from netaddr import EUI
from netaddr.core import AddrFormatError
from dcim.models import DeviceRole, Interface, Platform, Region, Site
from tenancy.models import Tenant
from extras.filters import CustomFieldFilterSet
from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet
from tenancy.filtersets import TenancyFilterSet
from tenancy.models import Tenant
from utilities.filters import (
MultiValueMACAddressFilter, NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter,
)
@@ -28,7 +28,7 @@ class ClusterGroupFilter(NameSlugSearchFilterSet):
fields = ['id', 'name', 'slug']
class ClusterFilter(CustomFieldFilterSet):
class ClusterFilter(CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'
@@ -86,7 +86,7 @@ class ClusterFilter(CustomFieldFilterSet):
)
class VirtualMachineFilter(TenancyFilterSet, CustomFieldFilterSet):
class VirtualMachineFilter(TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
id__in = NumericInFilter(
field_name='id',
lookup_expr='in'

2
netbox/virtualization/models.py
View File

@@ -106,7 +106,7 @@ class Cluster(ChangeLoggedModel, CustomFieldModel):
tenant = models.ForeignKey(
to='tenancy.Tenant',
on_delete=models.PROTECT,
related_name='tenants',
related_name='clusters',
blank=True,
null=True
)