From b1686c2db9be016c44258a18de783073fc0b3f61 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 10 Jul 2020 10:26:43 -0400 Subject: [PATCH] Fix bulk editing, deletion of VM interfaces --- netbox/virtualization/forms.py | 2 ++ netbox/virtualization/tables.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py index ce6eea1e8..26894fdd0 100644 --- a/netbox/virtualization/forms.py +++ b/netbox/virtualization/forms.py @@ -747,6 +747,8 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm): ) virtual_machine = forms.ModelChoiceField( queryset=VirtualMachine.objects.all(), + required=False, + disabled=True, widget=forms.HiddenInput() ) enabled = forms.NullBooleanField( diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py index d53572583..c1b927239 100644 --- a/netbox/virtualization/tables.py +++ b/netbox/virtualization/tables.py @@ -2,7 +2,7 @@ import django_tables2 as tables from django_tables2.utils import Accessor from tenancy.tables import COL_TENANT -from utilities.tables import BaseTable, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn +from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface VIRTUALMACHINE_STATUS = """ @@ -147,6 +147,8 @@ class VirtualMachineDetailTable(VirtualMachineTable): # class VMInterfaceTable(BaseTable): + pk = ToggleColumn() + enabled = BooleanColumn() virtual_machine = tables.LinkColumn() name = tables.Column( linkify=True @@ -154,4 +156,5 @@ class VMInterfaceTable(BaseTable): class Meta(BaseTable.Meta): model = VMInterface - fields = ('virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description') + fields = ('pk', 'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description') + default_columns = ('pk', 'virtual_machine', 'name', 'enabled', 'description')