NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 09:51:22 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixes #2816: Handle exception when deleting a device with connected components

Browse Source
This commit is contained in:
Jeremy Stretch 2019-01-29 14:27:47 -05:00
parent 0256448dd8
commit 8bd9b258a8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@ v2.5.4 (FUTURE)
* [#2795](https://github.com/digitalocean/netbox/issues/2795) - Fix duplicate display of pagination controls on child prefix/IP tables * [#2795](https://github.com/digitalocean/netbox/issues/2795) - Fix duplicate display of pagination controls on child prefix/IP tables
* [#2798](https://github.com/digitalocean/netbox/issues/2798) - Properly URL-encode "map it" link on site view * [#2798](https://github.com/digitalocean/netbox/issues/2798) - Properly URL-encode "map it" link on site view
* [#2802](https://github.com/digitalocean/netbox/issues/2802) - Better error handling for unsupported NAPALM methods * [#2802](https://github.com/digitalocean/netbox/issues/2802) - Better error handling for unsupported NAPALM methods
* [#2816](https://github.com/digitalocean/netbox/issues/2816) - Handle exception when deleting a device with connected components
--- ---

6
netbox/dcim/models.py
View File

@ -54,7 +54,11 @@ class ComponentModel(models.Model):
""" """
Log an ObjectChange including the parent Device/VM. Log an ObjectChange including the parent Device/VM.
""" """
parent = self.device if self.device is not None else getattr(self, 'virtual_machine', None) try:
parent = getattr(self, 'device', None) or getattr(self, 'virtual_machine', None)
except ObjectDoesNotExist:
# The parent device/VM has already been deleted
parent = None
ObjectChange( ObjectChange(
user=user, user=user,
request_id=request_id, request_id=request_id,