From b277d9265466608e3108de9f6675b52e718c4ef8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 7 May 2026 08:41:01 -0400 Subject: [PATCH] Remove the custom querystring template tag (closes #19091) Removes the deprecated querystring template tag from utilities/templatetags/ helpers.py and updates all 30 call sites across templates to use Django's built-in querystring tag (available since Django 5.1). The request argument is dropped since the built-in tag reads from the template context automatically. Co-Authored-By: Claude Sonnet 4.6 --- docs/release-notes/version-4.7.md | 13 ++++++++++ .../templates/dcim/rack_elevation_list.html | 8 +++---- netbox/templates/dcim/rack_list.html | 2 +- netbox/templates/generic/bulk_add.html | 2 +- netbox/templates/inc/paginator.html | 16 ++++++------- .../ipam/inc/ipaddress_edit_header.html | 6 ++--- netbox/templates/ipam/inc/max_depth.html | 4 ++-- netbox/templates/ipam/inc/max_length.html | 4 ++-- .../ipam/inc/prefix_edit_header.html | 4 ++-- .../templates/ipam/inc/toggle_available.html | 6 ++--- netbox/templates/ipam/ipaddress_assign.html | 2 +- netbox/utilities/templatetags/helpers.py | 24 ------------------- 12 files changed, 40 insertions(+), 51 deletions(-) create mode 100644 docs/release-notes/version-4.7.md diff --git a/docs/release-notes/version-4.7.md b/docs/release-notes/version-4.7.md new file mode 100644 index 000000000..f46cd5076 --- /dev/null +++ b/docs/release-notes/version-4.7.md @@ -0,0 +1,13 @@ +# NetBox v4.7 + +## v4.7.0 (FUTURE) + +### Breaking Changes + +### Enhancements + +### Other Changes + +* [#19091](https://github.com/netbox-community/netbox/issues/19091) - Remove the custom `querystring` template tag (use Django's built-in tag instead) + +### REST API Changes diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index 828e862eb..dcab72eeb 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -8,7 +8,7 @@ {% block controls %}
- + {% trans "View List" %}
- {% trans "Front" %} - {% trans "Rear" %} + {% trans "Front" %} + {% trans "Rear" %}
diff --git a/netbox/templates/dcim/rack_list.html b/netbox/templates/dcim/rack_list.html index ca72d2f25..1772ea7df 100644 --- a/netbox/templates/dcim/rack_list.html +++ b/netbox/templates/dcim/rack_list.html @@ -4,7 +4,7 @@ {% load i18n %} {% block extra_controls %} - + {% trans "View Elevations" %} {% endblock %} diff --git a/netbox/templates/generic/bulk_add.html b/netbox/templates/generic/bulk_add.html index 99b60b3a1..33bc0d769 100644 --- a/netbox/templates/generic/bulk_add.html +++ b/netbox/templates/generic/bulk_add.html @@ -8,7 +8,7 @@ {% block tabs %}
  • - + {% trans "Create" %}
    • diff --git a/netbox/templates/inc/paginator.html b/netbox/templates/inc/paginator.html index f7e2f160a..74fbd9359 100644 --- a/netbox/templates/inc/paginator.html +++ b/netbox/templates/inc/paginator.html @@ -19,11 +19,11 @@ {% if page.has_previous %}
  • {% if htmx %} - + {% else %} - + {% endif %} @@ -35,11 +35,11 @@ {% for p in page.smart_pages %}
  • {% if p and htmx %} - + {{ p }} {% elif p %} - + {{ p }} {% else %} @@ -53,11 +53,11 @@ {% if page.has_next %}
  • {% if htmx %} - + {% else %} - + {% endif %} @@ -89,9 +89,9 @@ {% for n in page.paginator.get_page_lengths %}
  • {% if htmx %} - {{ n }} + {{ n }} {% else %} - {{ n }} + {{ n }} {% endif %}
    • {% endfor %} diff --git a/netbox/templates/ipam/inc/ipaddress_edit_header.html b/netbox/templates/ipam/inc/ipaddress_edit_header.html index c7fbffee7..bc3d47eca 100644 --- a/netbox/templates/ipam/inc/ipaddress_edit_header.html +++ b/netbox/templates/ipam/inc/ipaddress_edit_header.html @@ -3,19 +3,19 @@
    • - + {% if object.pk %}{% trans "Edit" %}{% else %}{% trans "Create" %}{% endif %}
      • {% if 'interface' in request.GET or 'vminterface' in request.GET %}
    • - + {% trans "Assign IP" %}
      • {% elif not object.pk %}
    • - + {% trans "Bulk Create" %}
      • diff --git a/netbox/templates/ipam/inc/max_depth.html b/netbox/templates/ipam/inc/max_depth.html index 850e7df54..5ed637b10 100644 --- a/netbox/templates/ipam/inc/max_depth.html +++ b/netbox/templates/ipam/inc/max_depth.html @@ -8,11 +8,11 @@
        {% if request.GET.depth__lte %}
      • - {% trans "Clear" %} + {% trans "Clear" %}
        • {% endif %} {% for i in 16|as_range %} -
      • +
      • {{ i }} {% if request.GET.depth__lte == i %}{% endif %}
        • {% endfor %} diff --git a/netbox/templates/ipam/inc/max_length.html b/netbox/templates/ipam/inc/max_length.html index 858dd3529..98624aea8 100644 --- a/netbox/templates/ipam/inc/max_length.html +++ b/netbox/templates/ipam/inc/max_length.html @@ -8,11 +8,11 @@
          {% if request.GET.mask_length__lte %}
        • - {% trans "Clear" %} + {% trans "Clear" %}
          • {% endif %} {% for i in "4,8,12,16,20,24,28,32,40,48,56,64"|split %} -
        • +
        • {{ i }} {% if request.GET.mask_length__lte == i %}{% endif %}
          • {% endfor %} diff --git a/netbox/templates/ipam/inc/prefix_edit_header.html b/netbox/templates/ipam/inc/prefix_edit_header.html index bc63defe9..cd5c41d90 100644 --- a/netbox/templates/ipam/inc/prefix_edit_header.html +++ b/netbox/templates/ipam/inc/prefix_edit_header.html @@ -3,13 +3,13 @@
          • - + {% if object.pk %}{% trans "Prefix" %}{% else %}{% trans "Create" %}{% endif %}
            • {% if not object.pk %}
          • - + {% trans "Bulk Create" %}
            • diff --git a/netbox/templates/ipam/inc/toggle_available.html b/netbox/templates/ipam/inc/toggle_available.html index 52d56481a..7ccf9548b 100644 --- a/netbox/templates/ipam/inc/toggle_available.html +++ b/netbox/templates/ipam/inc/toggle_available.html @@ -3,13 +3,13 @@ {% if show_assigned or show_available is not None %}
            - + {% trans "Show Assigned" %} - + {% trans "Show Available" %} - + {% trans "Show All" %}
            diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html index 4711b286a..94197558c 100644 --- a/netbox/templates/ipam/ipaddress_assign.html +++ b/netbox/templates/ipam/ipaddress_assign.html @@ -12,7 +12,7 @@ {% endblock %} {% block form %} -
            + {% csrf_token %} {% for field in form.hidden_fields %} {{ field }} diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 5fc934b89..09c754302 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -1,5 +1,4 @@ import json -import warnings from typing import Any from urllib.parse import quote @@ -28,7 +27,6 @@ __all__ = ( 'kg_to_pounds', 'meters_to_feet', 'percentage', - 'querystring', 'startswith', 'status_from_tag', 'table_config_form', @@ -395,28 +393,6 @@ def icon_from_status(status: str = "info") -> str: # Tags # -@register.simple_tag() -def querystring(request, **kwargs): - """ - Append or update the page number in a querystring. - """ - warnings.warn( - 'The querystring template tag is deprecated and will be removed in a future release. Use ' - 'the built-in Django querystring tag instead.', - category=FutureWarning, - ) - querydict = request.GET.copy() - for k, v in kwargs.items(): - if v is not None: - querydict[k] = str(v) - elif k in querydict: - querydict.pop(k) - querystring = querydict.urlencode(safe='/') - if querystring: - return '?' + querystring - return '' - - @register.inclusion_tag('helpers/utilization_graph.html') def utilization_graph(utilization, warning_threshold=75, danger_threshold=90): """