diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 14e13ad44..4d332e904 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -2499,6 +2499,10 @@ class PowerOutletBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): queryset=PowerOutlet.objects.all(), widget=forms.MultipleHiddenInput() ) + device = forms.ModelChoiceField( + queryset=Device.objects.all(), + widget=forms.HiddenInput() + ) type = forms.ChoiceField( choices=PowerOutletTypeChoices, required=False @@ -2528,8 +2532,6 @@ class PowerOutletBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): if 'device' in self.initial: device = Device.objects.filter(pk=self.initial['device']).first() self.fields['power_port'].queryset = PowerPort.objects.filter(device=device) - else: - self.fields['power_port'].queryset = PowerPort.objects.none() class PowerOutletBulkRenameForm(BulkRenameForm): @@ -2773,6 +2775,10 @@ class InterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): queryset=Interface.objects.all(), widget=forms.MultipleHiddenInput() ) + device = forms.ModelChoiceField( + queryset=Device.objects.all(), + widget=forms.HiddenInput() + ) type = forms.ChoiceField( choices=add_blank_choice(InterfaceTypeChoices), required=False, @@ -2846,8 +2852,6 @@ class InterfaceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm): device__in=[device, device.get_vc_master()], type=InterfaceTypeChoices.TYPE_LAG ) - else: - self.fields['lag'].queryset = Interface.objects.none() def clean(self): diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 1c287cdc8..c36671349 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -619,6 +619,7 @@ {% if perms.dcim.delete_consoleserverport %}