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

Merge pull request #3858 from hSaria/3857-group-custom-link

Browse Source 
Fixes #3857: Fix group custom links rendering
This commit is contained in:
Jeremy Stretch 2020-01-09 09:28:03 -05:00 committed by GitHub
commit b36d0ca3fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@
* [#3589](https://github.com/netbox-community/netbox/issues/3589) - Fix validation on tagged VLANs of an interface * [#3589](https://github.com/netbox-community/netbox/issues/3589) - Fix validation on tagged VLANs of an interface
* [#3853](https://github.com/netbox-community/netbox/issues/3853) - Fix device role link on config context view * [#3853](https://github.com/netbox-community/netbox/issues/3853) - Fix device role link on config context view
* [#3856](https://github.com/netbox-community/netbox/issues/3856) - Allow filtering VM interfaces by multiple MAC addresses * [#3856](https://github.com/netbox-community/netbox/issues/3856) - Allow filtering VM interfaces by multiple MAC addresses
* [#3857](https://github.com/netbox-community/netbox/issues/3857) - Fix group custom links rendering
* [#3862](https://github.com/netbox-community/netbox/issues/3862) - Allow filtering device components by multiple device names * [#3862](https://github.com/netbox-community/netbox/issues/3862) - Allow filtering device components by multiple device names
--- ---

3
netbox/extras/templatetags/custom_links.py
View File

@ -68,8 +68,9 @@ def custom_links(obj):
text_rendered = render_jinja2(cl.text, context) text_rendered = render_jinja2(cl.text, context)
if text_rendered: if text_rendered:
link_target = ' target="_blank"' if cl.new_window else '' link_target = ' target="_blank"' if cl.new_window else ''
link_rendered = render_jinja2(cl.url, context)
links_rendered.append( links_rendered.append(
GROUP_LINK.format(cl.url, link_target, cl.text) GROUP_LINK.format(link_rendered, link_target, text_rendered)
) )
except Exception as e: except Exception as e:
links_rendered.append( links_rendered.append(