NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixes #3943: Prevent rack elevation links from opening new tabs/windows

Browse Source
This commit is contained in:
Jeremy Stretch 2020-01-16 23:41:52 -05:00
parent f220b3f128
commit 0a1dd64b94
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.7.md
View File

@ -3,6 +3,7 @@
## Bug Fixes ## Bug Fixes
* [#3941](https://github.com/netbox-community/netbox/issues/3941) - Fixed exception when attempting to assign IP to interface * [#3941](https://github.com/netbox-community/netbox/issues/3941) - Fixed exception when attempting to assign IP to interface
* [#3943](https://github.com/netbox-community/netbox/issues/3943) - Prevent rack elevation links from opening new tabs/windows
* [#3944](https://github.com/netbox-community/netbox/issues/3944) - Fix AttributeError exception when viewing prefixes list * [#3944](https://github.com/netbox-community/netbox/issues/3944) - Fix AttributeError exception when viewing prefixes list
--- ---

15
netbox/dcim/models/__init__.py
View File

@ -390,7 +390,9 @@ class RackElevationHelperMixin:
color = device.device_role.color color = device.device_role.color
link = drawing.add( link = drawing.add(
drawing.a( drawing.a(
reverse('dcim:device', kwargs={'pk': device.pk}), fill='black' href=reverse('dcim:device', kwargs={'pk': device.pk}),
target='_top',
fill='black'
) )
) )
link.add(drawing.rect(start, end, fill='#{}'.format(color))) link.add(drawing.rect(start, end, fill='#{}'.format(color)))
@ -405,10 +407,13 @@ class RackElevationHelperMixin:
@staticmethod @staticmethod
def _draw_empty(drawing, rack, start, end, text, id_, face_id, class_): def _draw_empty(drawing, rack, start, end, text, id_, face_id, class_):
link = drawing.add( link = drawing.add(
drawing.a('{}?{}'.format( drawing.a(
reverse('dcim:device_add'), href='{}?{}'.format(
urlencode({'rack': rack.pk, 'site': rack.site.pk, 'face': face_id, 'position': id_}) reverse('dcim:device_add'),
)) urlencode({'rack': rack.pk, 'site': rack.site.pk, 'face': face_id, 'position': id_})
),
target='_top'
)
) )
link.add(drawing.rect(start, end, class_=class_)) link.add(drawing.rect(start, end, class_=class_))
link.add(drawing.text("add device", insert=text, class_='add-device')) link.add(drawing.text("add device", insert=text, class_='add-device'))