Explorar o código

Move pk field declaration under NetBoxModelBulkEditForm

jeremystretch %!s(int64=4) %!d(string=hai) anos
pai
achega
5af18c2d8a

+ 0 - 16
netbox/circuits/forms/bulk_edit.py

@@ -15,10 +15,6 @@ __all__ = (
 
 
 
 
 class ProviderBulkEditForm(NetBoxModelBulkEditForm):
 class ProviderBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Provider.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     asn = forms.IntegerField(
     asn = forms.IntegerField(
         required=False,
         required=False,
         label='ASN'
         label='ASN'
@@ -54,10 +50,6 @@ class ProviderBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ProviderNetworkBulkEditForm(NetBoxModelBulkEditForm):
 class ProviderNetworkBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ProviderNetwork.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     provider = DynamicModelChoiceField(
     provider = DynamicModelChoiceField(
         queryset=Provider.objects.all(),
         queryset=Provider.objects.all(),
         required=False
         required=False
@@ -82,10 +74,6 @@ class ProviderNetworkBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class CircuitTypeBulkEditForm(NetBoxModelBulkEditForm):
 class CircuitTypeBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=CircuitType.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     description = forms.CharField(
     description = forms.CharField(
         max_length=200,
         max_length=200,
         required=False
         required=False
@@ -96,10 +84,6 @@ class CircuitTypeBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class CircuitBulkEditForm(NetBoxModelBulkEditForm):
 class CircuitBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Circuit.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     type = DynamicModelChoiceField(
     type = DynamicModelChoiceField(
         queryset=CircuitType.objects.all(),
         queryset=CircuitType.objects.all(),
         required=False
         required=False

+ 0 - 120
netbox/dcim/forms/bulk_edit.py

@@ -58,10 +58,6 @@ __all__ = (
 
 
 
 
 class RegionBulkEditForm(NetBoxModelBulkEditForm):
 class RegionBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Region.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     parent = DynamicModelChoiceField(
     parent = DynamicModelChoiceField(
         queryset=Region.objects.all(),
         queryset=Region.objects.all(),
         required=False
         required=False
@@ -76,10 +72,6 @@ class RegionBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class SiteGroupBulkEditForm(NetBoxModelBulkEditForm):
 class SiteGroupBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=SiteGroup.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     parent = DynamicModelChoiceField(
     parent = DynamicModelChoiceField(
         queryset=SiteGroup.objects.all(),
         queryset=SiteGroup.objects.all(),
         required=False
         required=False
@@ -94,10 +86,6 @@ class SiteGroupBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class SiteBulkEditForm(NetBoxModelBulkEditForm):
 class SiteBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Site.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     status = forms.ChoiceField(
     status = forms.ChoiceField(
         choices=add_blank_choice(SiteStatusChoices),
         choices=add_blank_choice(SiteStatusChoices),
         required=False,
         required=False,
@@ -138,10 +126,6 @@ class SiteBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class LocationBulkEditForm(NetBoxModelBulkEditForm):
 class LocationBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Location.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     site = DynamicModelChoiceField(
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         queryset=Site.objects.all(),
         required=False
         required=False
@@ -167,10 +151,6 @@ class LocationBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class RackRoleBulkEditForm(NetBoxModelBulkEditForm):
 class RackRoleBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=RackRole.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     color = ColorField(
     color = ColorField(
         required=False
         required=False
     )
     )
@@ -184,10 +164,6 @@ class RackRoleBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class RackBulkEditForm(NetBoxModelBulkEditForm):
 class RackBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Rack.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     region = DynamicModelChoiceField(
     region = DynamicModelChoiceField(
         queryset=Region.objects.all(),
         queryset=Region.objects.all(),
         required=False,
         required=False,
@@ -284,10 +260,6 @@ class RackBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class RackReservationBulkEditForm(NetBoxModelBulkEditForm):
 class RackReservationBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=RackReservation.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     user = forms.ModelChoiceField(
     user = forms.ModelChoiceField(
         queryset=User.objects.order_by(
         queryset=User.objects.order_by(
             'username'
             'username'
@@ -308,10 +280,6 @@ class RackReservationBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ManufacturerBulkEditForm(NetBoxModelBulkEditForm):
 class ManufacturerBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Manufacturer.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     description = forms.CharField(
     description = forms.CharField(
         max_length=200,
         max_length=200,
         required=False
         required=False
@@ -322,10 +290,6 @@ class ManufacturerBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class DeviceTypeBulkEditForm(NetBoxModelBulkEditForm):
 class DeviceTypeBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=DeviceType.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     manufacturer = DynamicModelChoiceField(
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
         queryset=Manufacturer.objects.all(),
         required=False
         required=False
@@ -353,10 +317,6 @@ class DeviceTypeBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ModuleTypeBulkEditForm(NetBoxModelBulkEditForm):
 class ModuleTypeBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ModuleType.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     manufacturer = DynamicModelChoiceField(
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
         queryset=Manufacturer.objects.all(),
         required=False
         required=False
@@ -370,10 +330,6 @@ class ModuleTypeBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class DeviceRoleBulkEditForm(NetBoxModelBulkEditForm):
 class DeviceRoleBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=DeviceRole.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     color = ColorField(
     color = ColorField(
         required=False
         required=False
     )
     )
@@ -392,10 +348,6 @@ class DeviceRoleBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class PlatformBulkEditForm(NetBoxModelBulkEditForm):
 class PlatformBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Platform.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     manufacturer = DynamicModelChoiceField(
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
         queryset=Manufacturer.objects.all(),
         required=False
         required=False
@@ -415,10 +367,6 @@ class PlatformBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class DeviceBulkEditForm(NetBoxModelBulkEditForm):
 class DeviceBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Device.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     manufacturer = DynamicModelChoiceField(
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
         queryset=Manufacturer.objects.all(),
         required=False
         required=False
@@ -476,10 +424,6 @@ class DeviceBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ModuleBulkEditForm(NetBoxModelBulkEditForm):
 class ModuleBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Module.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     manufacturer = DynamicModelChoiceField(
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
         queryset=Manufacturer.objects.all(),
         required=False
         required=False
@@ -502,10 +446,6 @@ class ModuleBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class CableBulkEditForm(NetBoxModelBulkEditForm):
 class CableBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Cable.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     type = forms.ChoiceField(
     type = forms.ChoiceField(
         choices=add_blank_choice(CableTypeChoices),
         choices=add_blank_choice(CableTypeChoices),
         required=False,
         required=False,
@@ -558,10 +498,6 @@ class CableBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class VirtualChassisBulkEditForm(NetBoxModelBulkEditForm):
 class VirtualChassisBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=VirtualChassis.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     domain = forms.CharField(
     domain = forms.CharField(
         max_length=30,
         max_length=30,
         required=False
         required=False
@@ -572,10 +508,6 @@ class VirtualChassisBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class PowerPanelBulkEditForm(NetBoxModelBulkEditForm):
 class PowerPanelBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=PowerPanel.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     region = DynamicModelChoiceField(
     region = DynamicModelChoiceField(
         queryset=Region.objects.all(),
         queryset=Region.objects.all(),
         required=False,
         required=False,
@@ -611,10 +543,6 @@ class PowerPanelBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class PowerFeedBulkEditForm(NetBoxModelBulkEditForm):
 class PowerFeedBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=PowerFeed.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     power_panel = DynamicModelChoiceField(
     power_panel = DynamicModelChoiceField(
         queryset=PowerPanel.objects.all(),
         queryset=PowerPanel.objects.all(),
         required=False
         required=False
@@ -928,10 +856,6 @@ class ConsolePortBulkEditForm(
     form_from_model(ConsolePort, ['label', 'type', 'speed', 'mark_connected', 'description']),
     form_from_model(ConsolePort, ['label', 'type', 'speed', 'mark_connected', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ConsolePort.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     mark_connected = forms.NullBooleanField(
     mark_connected = forms.NullBooleanField(
         required=False,
         required=False,
         widget=BulkEditNullBooleanSelect
         widget=BulkEditNullBooleanSelect
@@ -945,10 +869,6 @@ class ConsoleServerPortBulkEditForm(
     form_from_model(ConsoleServerPort, ['label', 'type', 'speed', 'mark_connected', 'description']),
     form_from_model(ConsoleServerPort, ['label', 'type', 'speed', 'mark_connected', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ConsoleServerPort.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     mark_connected = forms.NullBooleanField(
     mark_connected = forms.NullBooleanField(
         required=False,
         required=False,
         widget=BulkEditNullBooleanSelect
         widget=BulkEditNullBooleanSelect
@@ -962,10 +882,6 @@ class PowerPortBulkEditForm(
     form_from_model(PowerPort, ['label', 'type', 'maximum_draw', 'allocated_draw', 'mark_connected', 'description']),
     form_from_model(PowerPort, ['label', 'type', 'maximum_draw', 'allocated_draw', 'mark_connected', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=PowerPort.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     mark_connected = forms.NullBooleanField(
     mark_connected = forms.NullBooleanField(
         required=False,
         required=False,
         widget=BulkEditNullBooleanSelect
         widget=BulkEditNullBooleanSelect
@@ -979,10 +895,6 @@ class PowerOutletBulkEditForm(
     form_from_model(PowerOutlet, ['label', 'type', 'feed_leg', 'power_port', 'mark_connected', 'description']),
     form_from_model(PowerOutlet, ['label', 'type', 'feed_leg', 'power_port', 'mark_connected', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=PowerOutlet.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     device = forms.ModelChoiceField(
     device = forms.ModelChoiceField(
         queryset=Device.objects.all(),
         queryset=Device.objects.all(),
         required=False,
         required=False,
@@ -1016,10 +928,6 @@ class InterfaceBulkEditForm(
     ]),
     ]),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Interface.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     device = forms.ModelChoiceField(
     device = forms.ModelChoiceField(
         queryset=Device.objects.all(),
         queryset=Device.objects.all(),
         required=False,
         required=False,
@@ -1138,11 +1046,6 @@ class FrontPortBulkEditForm(
     form_from_model(FrontPort, ['label', 'type', 'color', 'mark_connected', 'description']),
     form_from_model(FrontPort, ['label', 'type', 'color', 'mark_connected', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=FrontPort.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
     model = FrontPort
     model = FrontPort
     nullable_fields = ('label', 'description')
     nullable_fields = ('label', 'description')
 
 
@@ -1151,11 +1054,6 @@ class RearPortBulkEditForm(
     form_from_model(RearPort, ['label', 'type', 'color', 'mark_connected', 'description']),
     form_from_model(RearPort, ['label', 'type', 'color', 'mark_connected', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=RearPort.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
     model = RearPort
     model = RearPort
     nullable_fields = ('label', 'description')
     nullable_fields = ('label', 'description')
 
 
@@ -1164,11 +1062,6 @@ class ModuleBayBulkEditForm(
     form_from_model(DeviceBay, ['label', 'description']),
     form_from_model(DeviceBay, ['label', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ModuleBay.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
     model = ModuleBay
     model = ModuleBay
     nullable_fields = ('label', 'position', 'description')
     nullable_fields = ('label', 'position', 'description')
 
 
@@ -1177,11 +1070,6 @@ class DeviceBayBulkEditForm(
     form_from_model(DeviceBay, ['label', 'description']),
     form_from_model(DeviceBay, ['label', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=DeviceBay.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
     model = DeviceBay
     model = DeviceBay
     nullable_fields = ('label', 'description')
     nullable_fields = ('label', 'description')
 
 
@@ -1190,10 +1078,6 @@ class InventoryItemBulkEditForm(
     form_from_model(InventoryItem, ['label', 'role', 'manufacturer', 'part_id', 'description']),
     form_from_model(InventoryItem, ['label', 'role', 'manufacturer', 'part_id', 'description']),
     NetBoxModelBulkEditForm
     NetBoxModelBulkEditForm
 ):
 ):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=InventoryItem.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     role = DynamicModelChoiceField(
     role = DynamicModelChoiceField(
         queryset=InventoryItemRole.objects.all(),
         queryset=InventoryItemRole.objects.all(),
         required=False
         required=False
@@ -1212,10 +1096,6 @@ class InventoryItemBulkEditForm(
 #
 #
 
 
 class InventoryItemRoleBulkEditForm(NetBoxModelBulkEditForm):
 class InventoryItemRoleBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=InventoryItemRole.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     color = ColorField(
     color = ColorField(
         required=False
         required=False
     )
     )

+ 1 - 56
netbox/ipam/forms/bulk_edit.py

@@ -31,10 +31,6 @@ __all__ = (
 
 
 
 
 class VRFBulkEditForm(NetBoxModelBulkEditForm):
 class VRFBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=VRF.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     tenant = DynamicModelChoiceField(
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
         queryset=Tenant.objects.all(),
         required=False
         required=False
@@ -54,10 +50,6 @@ class VRFBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class RouteTargetBulkEditForm(NetBoxModelBulkEditForm):
 class RouteTargetBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=RouteTarget.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     tenant = DynamicModelChoiceField(
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
         queryset=Tenant.objects.all(),
         required=False
         required=False
@@ -72,10 +64,6 @@ class RouteTargetBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class RIRBulkEditForm(NetBoxModelBulkEditForm):
 class RIRBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=RIR.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     is_private = forms.NullBooleanField(
     is_private = forms.NullBooleanField(
         required=False,
         required=False,
         widget=BulkEditNullBooleanSelect
         widget=BulkEditNullBooleanSelect
@@ -90,10 +78,6 @@ class RIRBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ASNBulkEditForm(NetBoxModelBulkEditForm):
 class ASNBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ASN.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     sites = DynamicModelMultipleChoiceField(
     sites = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         queryset=Site.objects.all(),
         required=False
         required=False
@@ -117,10 +101,6 @@ class ASNBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class AggregateBulkEditForm(NetBoxModelBulkEditForm):
 class AggregateBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Aggregate.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     rir = DynamicModelChoiceField(
     rir = DynamicModelChoiceField(
         queryset=RIR.objects.all(),
         queryset=RIR.objects.all(),
         required=False,
         required=False,
@@ -143,10 +123,6 @@ class AggregateBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class RoleBulkEditForm(NetBoxModelBulkEditForm):
 class RoleBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Role.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     weight = forms.IntegerField(
     weight = forms.IntegerField(
         required=False
         required=False
     )
     )
@@ -160,10 +136,6 @@ class RoleBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class PrefixBulkEditForm(NetBoxModelBulkEditForm):
 class PrefixBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Prefix.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     region = DynamicModelChoiceField(
     region = DynamicModelChoiceField(
         queryset=Region.objects.all(),
         queryset=Region.objects.all(),
         required=False
         required=False
@@ -225,10 +197,6 @@ class PrefixBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class IPRangeBulkEditForm(NetBoxModelBulkEditForm):
 class IPRangeBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=IPRange.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     vrf = DynamicModelChoiceField(
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         queryset=VRF.objects.all(),
         required=False,
         required=False,
@@ -259,10 +227,6 @@ class IPRangeBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class IPAddressBulkEditForm(NetBoxModelBulkEditForm):
 class IPAddressBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=IPAddress.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     vrf = DynamicModelChoiceField(
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         queryset=VRF.objects.all(),
         required=False,
         required=False,
@@ -304,10 +268,6 @@ class IPAddressBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class FHRPGroupBulkEditForm(NetBoxModelBulkEditForm):
 class FHRPGroupBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=FHRPGroup.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     protocol = forms.ChoiceField(
     protocol = forms.ChoiceField(
         choices=add_blank_choice(FHRPGroupProtocolChoices),
         choices=add_blank_choice(FHRPGroupProtocolChoices),
         required=False,
         required=False,
@@ -339,10 +299,6 @@ class FHRPGroupBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class VLANGroupBulkEditForm(NetBoxModelBulkEditForm):
 class VLANGroupBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=VLANGroup.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     site = DynamicModelChoiceField(
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         queryset=Site.objects.all(),
         required=False
         required=False
@@ -369,10 +325,6 @@ class VLANGroupBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class VLANBulkEditForm(NetBoxModelBulkEditForm):
 class VLANBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=VLAN.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     region = DynamicModelChoiceField(
     region = DynamicModelChoiceField(
         queryset=Region.objects.all(),
         queryset=Region.objects.all(),
         required=False
         required=False
@@ -421,10 +373,6 @@ class VLANBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ServiceTemplateBulkEditForm(NetBoxModelBulkEditForm):
 class ServiceTemplateBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ServiceTemplate.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     protocol = forms.ChoiceField(
     protocol = forms.ChoiceField(
         choices=add_blank_choice(ServiceProtocolChoices),
         choices=add_blank_choice(ServiceProtocolChoices),
         required=False,
         required=False,
@@ -447,7 +395,4 @@ class ServiceTemplateBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ServiceBulkEditForm(ServiceTemplateBulkEditForm):
 class ServiceBulkEditForm(ServiceTemplateBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Service.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
+    model = Service

+ 1 - 1
netbox/netbox/forms/base.py

@@ -72,7 +72,7 @@ class NetBoxModelBulkEditForm(BootstrapMixin, CustomFieldsMixin, forms.Form):
     nullable_fields = ()
     nullable_fields = ()
 
 
     pk = forms.ModelMultipleChoiceField(
     pk = forms.ModelMultipleChoiceField(
-        queryset=None,
+        queryset=None,  # Set from self.model on init
         widget=forms.MultipleHiddenInput
         widget=forms.MultipleHiddenInput
     )
     )
     add_tags = DynamicModelMultipleChoiceField(
     add_tags = DynamicModelMultipleChoiceField(

+ 0 - 20
netbox/tenancy/forms/bulk_edit.py

@@ -18,10 +18,6 @@ __all__ = (
 #
 #
 
 
 class TenantGroupBulkEditForm(NetBoxModelBulkEditForm):
 class TenantGroupBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=TenantGroup.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     parent = DynamicModelChoiceField(
     parent = DynamicModelChoiceField(
         queryset=TenantGroup.objects.all(),
         queryset=TenantGroup.objects.all(),
         required=False
         required=False
@@ -36,10 +32,6 @@ class TenantGroupBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class TenantBulkEditForm(NetBoxModelBulkEditForm):
 class TenantBulkEditForm(NetBoxModelBulkEditForm):
-    # pk = forms.ModelMultipleChoiceField(
-    #     queryset=Tenant.objects.all(),
-    #     widget=forms.MultipleHiddenInput()
-    # )
     group = DynamicModelChoiceField(
     group = DynamicModelChoiceField(
         queryset=TenantGroup.objects.all(),
         queryset=TenantGroup.objects.all(),
         required=False
         required=False
@@ -54,10 +46,6 @@ class TenantBulkEditForm(NetBoxModelBulkEditForm):
 #
 #
 
 
 class ContactGroupBulkEditForm(NetBoxModelBulkEditForm):
 class ContactGroupBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ContactGroup.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     parent = DynamicModelChoiceField(
     parent = DynamicModelChoiceField(
         queryset=ContactGroup.objects.all(),
         queryset=ContactGroup.objects.all(),
         required=False
         required=False
@@ -72,10 +60,6 @@ class ContactGroupBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ContactRoleBulkEditForm(NetBoxModelBulkEditForm):
 class ContactRoleBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ContactRole.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     description = forms.CharField(
     description = forms.CharField(
         max_length=200,
         max_length=200,
         required=False
         required=False
@@ -86,10 +70,6 @@ class ContactRoleBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ContactBulkEditForm(NetBoxModelBulkEditForm):
 class ContactBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Contact.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     group = DynamicModelChoiceField(
     group = DynamicModelChoiceField(
         queryset=ContactGroup.objects.all(),
         queryset=ContactGroup.objects.all(),
         required=False
         required=False

+ 0 - 20
netbox/virtualization/forms/bulk_edit.py

@@ -24,10 +24,6 @@ __all__ = (
 
 
 
 
 class ClusterTypeBulkEditForm(NetBoxModelBulkEditForm):
 class ClusterTypeBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ClusterType.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     description = forms.CharField(
     description = forms.CharField(
         max_length=200,
         max_length=200,
         required=False
         required=False
@@ -38,10 +34,6 @@ class ClusterTypeBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ClusterGroupBulkEditForm(NetBoxModelBulkEditForm):
 class ClusterGroupBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ClusterGroup.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     description = forms.CharField(
     description = forms.CharField(
         max_length=200,
         max_length=200,
         required=False
         required=False
@@ -52,10 +44,6 @@ class ClusterGroupBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class ClusterBulkEditForm(NetBoxModelBulkEditForm):
 class ClusterBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Cluster.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     type = DynamicModelChoiceField(
     type = DynamicModelChoiceField(
         queryset=ClusterType.objects.all(),
         queryset=ClusterType.objects.all(),
         required=False
         required=False
@@ -96,10 +84,6 @@ class ClusterBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class VirtualMachineBulkEditForm(NetBoxModelBulkEditForm):
 class VirtualMachineBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=VirtualMachine.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     status = forms.ChoiceField(
     status = forms.ChoiceField(
         choices=add_blank_choice(VirtualMachineStatusChoices),
         choices=add_blank_choice(VirtualMachineStatusChoices),
         required=False,
         required=False,
@@ -151,10 +135,6 @@ class VirtualMachineBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class VMInterfaceBulkEditForm(NetBoxModelBulkEditForm):
 class VMInterfaceBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=VMInterface.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
     virtual_machine = forms.ModelChoiceField(
     virtual_machine = forms.ModelChoiceField(
         queryset=VirtualMachine.objects.all(),
         queryset=VirtualMachine.objects.all(),
         required=False,
         required=False,

+ 0 - 12
netbox/wireless/forms/bulk_edit.py

@@ -16,10 +16,6 @@ __all__ = (
 
 
 
 
 class WirelessLANGroupBulkEditForm(NetBoxModelBulkEditForm):
 class WirelessLANGroupBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=WirelessLANGroup.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     parent = DynamicModelChoiceField(
     parent = DynamicModelChoiceField(
         queryset=WirelessLANGroup.objects.all(),
         queryset=WirelessLANGroup.objects.all(),
         required=False
         required=False
@@ -34,10 +30,6 @@ class WirelessLANGroupBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class WirelessLANBulkEditForm(NetBoxModelBulkEditForm):
 class WirelessLANBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=WirelessLAN.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     group = DynamicModelChoiceField(
     group = DynamicModelChoiceField(
         queryset=WirelessLANGroup.objects.all(),
         queryset=WirelessLANGroup.objects.all(),
         required=False
         required=False
@@ -75,10 +67,6 @@ class WirelessLANBulkEditForm(NetBoxModelBulkEditForm):
 
 
 
 
 class WirelessLinkBulkEditForm(NetBoxModelBulkEditForm):
 class WirelessLinkBulkEditForm(NetBoxModelBulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=WirelessLink.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
     ssid = forms.CharField(
     ssid = forms.CharField(
         max_length=SSID_MAX_LENGTH,
         max_length=SSID_MAX_LENGTH,
         required=False,
         required=False,