Skip to content

Commit 01fa271

Browse files
committed
Fixes #15067: Fix uncaught exception when attempting invalid device bay import
1 parent 12d830b commit 01fa271

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

netbox/dcim/forms/bulk_import.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ def __init__(self, *args, **kwargs):
996996
device_type__subdevice_role=SubdeviceRoleChoices.ROLE_CHILD
997997
).exclude(pk=device.pk)
998998
else:
999-
self.fields['installed_device'].queryset = Interface.objects.none()
999+
self.fields['installed_device'].queryset = Device.objects.none()
10001000

10011001

10021002
class InventoryItemImportForm(NetBoxModelImportForm):

netbox/dcim/models/device_components.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,13 +1133,13 @@ def clean(self):
11331133
super().clean()
11341134

11351135
# Validate that the parent Device can have DeviceBays
1136-
if not self.device.device_type.is_parent_device:
1136+
if hasattr(self, 'device') and not self.device.device_type.is_parent_device:
11371137
raise ValidationError(_("This type of device ({device_type}) does not support device bays.").format(
11381138
device_type=self.device.device_type
11391139
))
11401140

11411141
# Cannot install a device into itself, obviously
1142-
if self.device == self.installed_device:
1142+
if self.installed_device and getattr(self, 'device', None) == self.installed_device:
11431143
raise ValidationError(_("Cannot install a device into itself."))
11441144

11451145
# Check that the installed device is not already installed elsewhere

0 commit comments

Comments
 (0)