From b748f76e173dca4b04a30baf535bd49a76339303 Mon Sep 17 00:00:00 2001 From: Saria Hajjar Date: Mon, 13 Jan 2020 20:34:53 +0000 Subject: [PATCH] Fixes #3909: Regression from #3898 --- docs/release-notes/version-2.6.md | 10 +++++++++- netbox/dcim/models.py | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md index d77fbd365..afa8621bb 100644 --- a/docs/release-notes/version-2.6.md +++ b/docs/release-notes/version-2.6.md @@ -1,3 +1,11 @@ +# v2.6.13 (FUTURE) + +## Bug Fixes + +* [#3909](https://github.com/netbox-community/netbox/issues/3909) - Fixed a regression caused by [#3898](https://github.com/netbox-community/netbox/issues/3898) when browsing to device details page + +--- + # v2.6.12 (2020-01-13) ## Enhancements @@ -30,7 +38,7 @@ * [#3872](https://github.com/netbox-community/netbox/issues/3872) - Paginate related IPs on the IP address view * [#3876](https://github.com/netbox-community/netbox/issues/3876) - Fix minimum/maximum value rendering for site ASN field * [#3882](https://github.com/netbox-community/netbox/issues/3882) - Fix filtering of devices by rack group -* [#3898](https://github.com/netbox-community/netbox/issues/3898) - Fix references to deleted cables without a label +* [#3898](https://github.com/netbox-community/netbox/issues/3898) - Fix references to deleted cables without a label * [#3905](https://github.com/netbox-community/netbox/issues/3905) - Fix divide-by-zero on power feeds with low power values --- diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 833fb483b..5a7d13564 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -3034,7 +3034,7 @@ class Cable(ChangeLoggedModel): self._pk = self.pk def __str__(self): - return self.label or '#{}'.format(self._pk) + return self.label or '#{}'.format(getattr(self, '_pk', self.pk)) def get_absolute_url(self): return reverse('dcim:cable', args=[self.pk])