From bcfc2e5f74edd38feea7f7b00c62e54c35beb23b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 25 Mar 2021 11:51:02 -0400 Subject: [PATCH] Changelog & tweaks for #5650 --- docs/release-notes/version-2.10.md | 1 + netbox/dcim/models/cables.py | 4 +++- netbox/templates/dcim/cable_trace.html | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md index 0e1ed4fa5..8f824b448 100644 --- a/docs/release-notes/version-2.10.md +++ b/docs/release-notes/version-2.10.md @@ -12,6 +12,7 @@ ### Bug Fixes * [#5595](https://github.com/netbox-community/netbox/issues/5595) - Restore ability to delete an uploaded device type image +* [#5650](https://github.com/netbox-community/netbox/issues/5650) - Denote when the total length of a cable trace may exceed the indicated value * [#5953](https://github.com/netbox-community/netbox/issues/5953) - Support Markdown rendering for custom script descriptions * [#5962](https://github.com/netbox-community/netbox/issues/5962) - Ensure consistent display of change log action labels * [#5966](https://github.com/netbox-community/netbox/issues/5966) - Skip Markdown reference link when tabbing through form fields diff --git a/netbox/dcim/models/cables.py b/netbox/dcim/models/cables.py index 898e73b4c..e8c9211f5 100644 --- a/netbox/dcim/models/cables.py +++ b/netbox/dcim/models/cables.py @@ -490,11 +490,13 @@ class CablePath(models.Model): cables = Cable.objects.filter(id__in=cable_ids, _abs_length__isnull=False) total_length = cables.aggregate(total=Sum('_abs_length'))['total'] is_definitive = len(cables) == len(cable_ids) - return (total_length, is_definitive) + + return total_length, is_definitive def get_split_nodes(self): """ Return all available next segments in a split cable path. """ rearport = path_node_to_object(self.path[-1]) + return FrontPort.objects.filter(rear_port=rearport) diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html index 060fe2076..66c838502 100644 --- a/netbox/templates/dcim/cable_trace.html +++ b/netbox/templates/dcim/cable_trace.html @@ -69,7 +69,7 @@
Total segments: {{ traced_path|length }}
Total length: {% if total_length %} - {% if not is_definitive %}>{% endif %}{{ total_length|floatformat:"-2" }} Meters / + {{ total_length|floatformat:"-2" }}{% if not is_definitive %}+{% endif %} Meters / {{ total_length|meters_to_feet|floatformat:"-2" }} Feet {% else %} N/A