Skip to content

Commit

Permalink
Fixes #15067: Fix uncaught exception when attempting invalid device b…
Browse files Browse the repository at this point in the history
…ay import
  • Loading branch information
jeremystretch committed Feb 13, 2024
1 parent 12d830b commit 01fa271
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion netbox/dcim/forms/bulk_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ def __init__(self, *args, **kwargs):
device_type__subdevice_role=SubdeviceRoleChoices.ROLE_CHILD
).exclude(pk=device.pk)
else:
self.fields['installed_device'].queryset = Interface.objects.none()
self.fields['installed_device'].queryset = Device.objects.none()


class InventoryItemImportForm(NetBoxModelImportForm):
Expand Down
4 changes: 2 additions & 2 deletions netbox/dcim/models/device_components.py
Original file line number Diff line number Diff line change
Expand Up @@ -1133,13 +1133,13 @@ def clean(self):
super().clean()

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

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

# Check that the installed device is not already installed elsewhere
Expand Down

0 comments on commit 01fa271

Please sign in to comment.