NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-18 19:32:24 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge v2.11.2

Browse Source
This commit is contained in:
jeremystretch
2021-04-27 14:05:38 -04:00
parent 368c2aac24 51f6d2f45e
commit 456ffb79ff
26 changed files with 138 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/virtualization/filters.py
View File

@@ -20,14 +20,14 @@ __all__ = (
)
class ClusterTypeFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
class ClusterTypeFilterSet(BaseFilterSet, NameSlugSearchFilterSet, CreatedUpdatedFilterSet):
class Meta:
model = ClusterType
fields = ['id', 'name', 'slug', 'description']
class ClusterGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
class ClusterGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet, CreatedUpdatedFilterSet):
class Meta:
model = ClusterGroup

2
netbox/virtualization/forms.py
View File

@@ -682,7 +682,7 @@ class VMInterfaceCreateForm(BootstrapMixin, InterfaceCommonForm):
label='MAC Address'
)
description = forms.CharField(
max_length=100,
max_length=200,
required=False
)
mode = forms.ChoiceField(