From 834b233c305ca3b268a7549b741d0936ef57cadb Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 14 May 2021 09:06:00 -0400 Subject: [PATCH] Fixes #6398: Avoid exception when deleting device connected to self via circuit --- docs/release-notes/version-2.11.md | 1 + netbox/dcim/signals.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index 9bf803d13..4997f665d 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -9,6 +9,7 @@ ### Bug Fixes * [#6376](https://github.com/netbox-community/netbox/issues/6376) - Fix assignment of VLAN groups to clusters, cluster groups via REST API +* [#6398](https://github.com/netbox-community/netbox/issues/6398) - Avoid exception when deleting device connected to self via circuit --- diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py index 1dbdca140..8675ee7ce 100644 --- a/netbox/dcim/signals.py +++ b/netbox/dcim/signals.py @@ -31,9 +31,10 @@ def rebuild_paths(obj): with transaction.atomic(): for cp in cable_paths: - invalidate_obj(cp.origin) cp.delete() - create_cablepath(cp.origin) + if cp.origin: + invalidate_obj(cp.origin) + create_cablepath(cp.origin) #