From e7a14e0902c9817192933cb2b1978d87c4c8caff Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 14 Aug 2025 12:54:46 -0400 Subject: [PATCH] Adjust TODO release targets --- netbox/extras/scripts.py | 8 ++++---- netbox/netbox/constants.py | 2 +- netbox/utilities/templatetags/buttons.py | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index 420ef4882..a14eba556 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -588,9 +588,9 @@ class BaseScript: """ Return data from a YAML file """ - # TODO: DEPRECATED: Remove this method in v4.4 + # TODO: DEPRECATED: Remove this method in v4.5 self._log( - _("load_yaml is deprecated and will be removed in v4.4"), + _("load_yaml is deprecated and will be removed in v4.5"), level=LogLevelChoices.LOG_WARNING ) file_path = os.path.join(settings.SCRIPTS_ROOT, filename) @@ -603,9 +603,9 @@ class BaseScript: """ Return data from a JSON file """ - # TODO: DEPRECATED: Remove this method in v4.4 + # TODO: DEPRECATED: Remove this method in v4.5 self._log( - _("load_json is deprecated and will be removed in v4.4"), + _("load_json is deprecated and will be removed in v4.5"), level=LogLevelChoices.LOG_WARNING ) file_path = os.path.join(settings.SCRIPTS_ROOT, filename) diff --git a/netbox/netbox/constants.py b/netbox/netbox/constants.py index d3f9c4786..a0ba966d7 100644 --- a/netbox/netbox/constants.py +++ b/netbox/netbox/constants.py @@ -44,7 +44,7 @@ ADVISORY_LOCK_KEYS = { 'job-schedules': 110100, } -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.5 # Legacy default view action permission mapping DEFAULT_ACTION_PERMISSIONS = { 'add': {'add'}, diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py index d6776d727..e8ce71dce 100644 --- a/netbox/utilities/templatetags/buttons.py +++ b/netbox/utilities/templatetags/buttons.py @@ -107,7 +107,7 @@ def subscribe_button(context, instance): # Legacy object buttons # -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/clone.html') def clone_button(instance): # Resolve URL path @@ -125,7 +125,7 @@ def clone_button(instance): } -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/edit.html') def edit_button(instance): url = get_action_url(instance, action='edit', kwargs={'pk': instance.pk}) @@ -136,7 +136,7 @@ def edit_button(instance): } -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/delete.html') def delete_button(instance): url = get_action_url(instance, action='delete', kwargs={'pk': instance.pk}) @@ -147,7 +147,7 @@ def delete_button(instance): } -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/sync.html') def sync_button(instance): url = get_action_url(instance, action='sync', kwargs={'pk': instance.pk}) @@ -162,7 +162,7 @@ def sync_button(instance): # Legacy list buttons # -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/add.html') def add_button(model, action='add'): try: @@ -176,7 +176,7 @@ def add_button(model, action='add'): } -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/import.html') def import_button(model, action='bulk_import'): try: @@ -190,7 +190,7 @@ def import_button(model, action='bulk_import'): } -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/export.html', takes_context=True) def export_button(context, model): object_type = ObjectType.objects.get_for_model(model) @@ -212,7 +212,7 @@ def export_button(context, model): } -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/bulk_edit.html', takes_context=True) def bulk_edit_button(context, model, action='bulk_edit', query_params=None): try: @@ -229,7 +229,7 @@ def bulk_edit_button(context, model, action='bulk_edit', query_params=None): } -# TODO: Remove in NetBox v4.6 +# TODO: Remove in NetBox v4.7 @register.inclusion_tag('buttons/bulk_delete.html', takes_context=True) def bulk_delete_button(context, model, action='bulk_delete', query_params=None): try: