diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index 049e8acc5..beceae802 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -9,6 +9,7 @@ ### Bug Fixes * [#9231](https://github.com/netbox-community/netbox/issues/9231) - Fix `empty` lookup expression for string filters +* [#10259](https://github.com/netbox-community/netbox/issues/10259) - Fix `NoReverseMatch` exception when listing available prefixes with "flat" column displayed * [#10270](https://github.com/netbox-community/netbox/issues/10270) - Fix custom field validation when creating new services * [#10278](https://github.com/netbox-community/netbox/issues/10278) - Fix "create & add another" for image attachments diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index f3c45ec1d..a820385ed 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -21,6 +21,14 @@ __all__ = ( AVAILABLE_LABEL = mark_safe('Available') PREFIX_LINK = """ +{% if record.pk %} + {{ record.prefix }} +{% else %} + {{ record.prefix }} +{% endif %} +""" + +PREFIX_LINK_WITH_DEPTH = """ {% load helpers %} {% if record.depth %}
@@ -29,8 +37,7 @@ PREFIX_LINK = """ {% endfor %}
{% endif %} -{{ record.prefix }} -""" +""" + PREFIX_LINK IPADDRESS_LINK = """ {% if record.pk %} @@ -216,14 +223,15 @@ class PrefixUtilizationColumn(columns.UtilizationColumn): class PrefixTable(TenancyColumnsMixin, NetBoxTable): prefix = columns.TemplateColumn( - template_code=PREFIX_LINK, + template_code=PREFIX_LINK_WITH_DEPTH, export_raw=True, attrs={'td': {'class': 'text-nowrap'}} ) - prefix_flat = tables.Column( + prefix_flat = columns.TemplateColumn( accessor=Accessor('prefix'), - linkify=True, - verbose_name='Prefix (Flat)', + template_code=PREFIX_LINK, + export_raw=True, + verbose_name='Prefix (Flat)' ) depth = tables.Column( accessor=Accessor('_depth'),