NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 12:12:53 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #17107: Circuit to Provider Network cabling visual bug

Browse Source
This commit is contained in:
Jason Novinger 2025-05-05 10:57:03 -05:00 committed by Jeremy Stretch
parent 045417c45c
commit 8baf15771a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/dcim/svg/cables.py
View File

@ -329,11 +329,9 @@ class CableTraceSVG:
# Draw attachment (line) # Draw attachment (line)
start = (OFFSET + self.center, OFFSET + self.cursor) start = (OFFSET + self.center, OFFSET + self.cursor)
height = PADDING * 2 + LINE_HEIGHT + PADDING * 2 end = (start[0], start[1] + CABLE_HEIGHT)
end = (start[0], start[1] + height)
line = Line(start=start, end=end, class_='attachment') line = Line(start=start, end=end, class_='attachment')
group.add(line) group.add(line)
self.cursor += PADDING * 4
return group return group
@ -358,10 +356,10 @@ class CableTraceSVG:
# Else: No need to draw parent objects (parent objects are drawn in last "round" as the far-end!) # Else: No need to draw parent objects (parent objects are drawn in last "round" as the far-end!)
near_terminations = self.draw_terminations(near_ends, parent_object_nodes) near_terminations = self.draw_terminations(near_ends, parent_object_nodes)
self.cursor += CABLE_HEIGHT
# Connector (a Cable or WirelessLink) # Connector (a Cable or WirelessLink)
if links and far_ends: if links and far_ends:
self.cursor += CABLE_HEIGHT
obj_list = {end.parent_object for end in far_ends} obj_list = {end.parent_object for end in far_ends}
parent_object_nodes, far_terminations = self.draw_far_objects(obj_list, far_ends) parent_object_nodes, far_terminations = self.draw_far_objects(obj_list, far_ends)
@ -449,6 +447,7 @@ class CableTraceSVG:
# Attachment # Attachment
attachment = self.draw_attachment() attachment = self.draw_attachment()
self.connectors.append(attachment) self.connectors.append(attachment)
self.cursor += CABLE_HEIGHT
# Object # Object
parent_object_nodes = self.draw_parent_objects(far_ends) parent_object_nodes = self.draw_parent_objects(far_ends)