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

Merge v2.11.2

This commit is contained in:
jeremystretch
2021-04-27 14:05:38 -04:00
26 changed files with 138 additions and 73 deletions

View File

@ -2153,7 +2153,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
ip_choices = [(None, '---------')]
# Gather PKs of all interfaces belonging to this Device or a peer VirtualChassis member
interface_ids = self.instance.vc_interfaces.values_list('pk', flat=True)
interface_ids = self.instance.vc_interfaces().values_list('pk', flat=True)
# Collect interface IPs
interface_ips = IPAddress.objects.filter(
@ -2552,7 +2552,7 @@ class ComponentCreateForm(BootstrapMixin, CustomFieldForm, ComponentForm):
queryset=Device.objects.all()
)
description = forms.CharField(
max_length=100,
max_length=200,
required=False
)
tags = DynamicModelMultipleChoiceField(