Просмотр исходного кода

Fix bulk editing, deletion of VM interfaces

Jeremy Stretch 5 лет назад
Родитель
Сommit
b1686c2db9
2 измененных файлов с 7 добавлено и 2 удалено
  1. 2 0
      netbox/virtualization/forms.py
  2. 5 2
      netbox/virtualization/tables.py

+ 2 - 0
netbox/virtualization/forms.py

@@ -747,6 +747,8 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
     )
     )
     virtual_machine = forms.ModelChoiceField(
     virtual_machine = forms.ModelChoiceField(
         queryset=VirtualMachine.objects.all(),
         queryset=VirtualMachine.objects.all(),
+        required=False,
+        disabled=True,
         widget=forms.HiddenInput()
         widget=forms.HiddenInput()
     )
     )
     enabled = forms.NullBooleanField(
     enabled = forms.NullBooleanField(

+ 5 - 2
netbox/virtualization/tables.py

@@ -2,7 +2,7 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 from django_tables2.utils import Accessor
 
 
 from tenancy.tables import COL_TENANT
 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
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 
 VIRTUALMACHINE_STATUS = """
 VIRTUALMACHINE_STATUS = """
@@ -147,6 +147,8 @@ class VirtualMachineDetailTable(VirtualMachineTable):
 #
 #
 
 
 class VMInterfaceTable(BaseTable):
 class VMInterfaceTable(BaseTable):
+    pk = ToggleColumn()
+    enabled = BooleanColumn()
     virtual_machine = tables.LinkColumn()
     virtual_machine = tables.LinkColumn()
     name = tables.Column(
     name = tables.Column(
         linkify=True
         linkify=True
@@ -154,4 +156,5 @@ class VMInterfaceTable(BaseTable):
 
 
     class Meta(BaseTable.Meta):
     class Meta(BaseTable.Meta):
         model = VMInterface
         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')