mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #3596: Prevent server error when reassigning a device to a new device bay

Browse Source
This commit is contained in:
Jeremy Stretch
2019-10-23 09:28:00 -04:00
parent f21a63382c
commit 7467347af1
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/release-notes/version-2.6.md
View File

@ -2,12 +2,14 @@
## Enhancements ## Enhancements
* [#3340](https://github.com/netbox-community/netbox/issues/3340) - Add missing options to connect front ports to console ports
* [#3445](https://github.com/netbox-community/netbox/issues/3445) - Add support for additional user defined headers to be added to webhook requests * [#3445](https://github.com/netbox-community/netbox/issues/3445) - Add support for additional user defined headers to be added to webhook requests
* [#3499](https://github.com/netbox-community/netbox/issues/3499) - Add `ca_file_path` to Webhook model to support user supplied CA certificate verification of webhook requests * [#3499](https://github.com/netbox-community/netbox/issues/3499) - Add `ca_file_path` to Webhook model to support user supplied CA certificate verification of webhook requests
## Bug Fixes ## Bug Fixes
* [#3340](https://github.com/netbox-community/netbox/issues/3340) - Add missing options to connect front ports to console ports
* [#3596](https://github.com/netbox-community/netbox/issues/3596) - Prevent server error when reassigning a device to a new device bay
--- ---
# v2.6.6 (2019-10-10) # v2.6.6 (2019-10-10)

10
netbox/dcim/models.py
View File

@ -2588,6 +2588,16 @@ class DeviceBay(ComponentModel):
if self.device == self.installed_device: if self.device == self.installed_device:
raise ValidationError("Cannot install a device into itself.") raise ValidationError("Cannot install a device into itself.")
# Check that the installed device is not already installed elsewhere
if self.installed_device:
current_bay = DeviceBay.objects.filter(installed_device=self.installed_device).first()
if current_bay:
raise ValidationError({
'installed_device': "Cannot install the specified device; device is already installed in {}".format(
current_bay
)
})
# #
# Inventory items # Inventory items