From e639de986189abed9735ed4ede136cce183ceecd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 25 Mar 2021 15:36:32 -0400 Subject: [PATCH 1/3] PRVB --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index b909510dd..017ca9c22 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -16,7 +16,7 @@ from django.core.validators import URLValidator # Environment setup # -VERSION = '2.10.7' +VERSION = '2.10.8-dev' # Hostname HOSTNAME = platform.node() From 8eca7377a589b91b54e58d43662a8dd048d4f9dd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Mar 2021 09:40:51 -0400 Subject: [PATCH 2/3] Fixes #6060: Fix exception on cable trace in UI --- docs/release-notes/version-2.10.md | 8 ++++++++ netbox/dcim/views.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md index 81a68dbd3..72ec3d6aa 100644 --- a/docs/release-notes/version-2.10.md +++ b/docs/release-notes/version-2.10.md @@ -1,5 +1,13 @@ # NetBox v2.10 +## v2.10.8 (FUTURE) + +### Bug Fixes + +* [#6060](https://github.com/netbox-community/netbox/issues/6060) - Fix exception on cable trace in UI (regression from #5650) + +--- + ## v2.10.7 (2021-03-25) ### Enhancements diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index faec98cb7..ffdbf933f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2135,7 +2135,7 @@ class PathTraceView(generic.ObjectView): path = related_paths.first() # Get the total length of the cable and whether the length is definitive (fully defined) - total_length, is_definitive = path.get_total_length if path else (None, False) + total_length, is_definitive = path.get_total_length() if path else (None, False) return { 'path': path, From f59b5119e530d8ca3081a2ea38fea3940af206fc Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 26 Mar 2021 10:04:00 -0400 Subject: [PATCH 3/3] Release v2.10.8 --- docs/release-notes/version-2.10.md | 2 +- netbox/netbox/settings.py | 2 +- requirements.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md index 72ec3d6aa..7031f7fb8 100644 --- a/docs/release-notes/version-2.10.md +++ b/docs/release-notes/version-2.10.md @@ -1,6 +1,6 @@ # NetBox v2.10 -## v2.10.8 (FUTURE) +## v2.10.8 (2021-03-26) ### Bug Fixes diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 017ca9c22..a97a8ec74 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -16,7 +16,7 @@ from django.core.validators import URLValidator # Environment setup # -VERSION = '2.10.8-dev' +VERSION = '2.10.8' # Hostname HOSTNAME = platform.node() diff --git a/requirements.txt b/requirements.txt index ae16926b7..6c41dcee0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,8 +9,8 @@ django-prometheus==2.1.0 django-rq==2.4.0 django-tables2==2.3.4 django-taggit==1.3.0 -django-timezone-field==4.1.1 -djangorestframework==3.12.2 +django-timezone-field==4.1.2 +djangorestframework==3.12.4 drf-yasg[validation]==1.20.0 gunicorn==20.0.4 Jinja2==2.11.3