From 6744a96652a5d77a8998aa2ecf8e4ce125eb2976 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Mon, 21 Jul 2025 10:39:41 -0400
Subject: [PATCH] Restore support for passing return_url

---
 netbox/templates/core/buttons/bulk_sync.html        | 2 +-
 netbox/templates/dcim/buttons/bulk_disconnect.html  | 2 +-
 netbox/templates/generic/object_children.html       | 2 +-
 netbox/utilities/templates/buttons/bulk_delete.html | 2 +-
 netbox/utilities/templates/buttons/bulk_edit.html   | 2 +-
 netbox/utilities/templates/buttons/bulk_rename.html | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/templates/core/buttons/bulk_sync.html b/netbox/templates/core/buttons/bulk_sync.html
index e92ad15df..e70b3a459 100644
--- a/netbox/templates/core/buttons/bulk_sync.html
+++ b/netbox/templates/core/buttons/bulk_sync.html
@@ -1,3 +1,3 @@
-<button type="submit" name="_sync" {% formaction %}="{{ url }}" class="btn btn-primary">
+<button type="submit" name="_sync" {% formaction %}="{{ url }}{% if return_url %}?return_url={{ return_url }}{% endif %}" class="btn btn-primary">
   <i class="mdi mdi-sync" aria-hidden="true"></i> {{ label }}
 </button>
diff --git a/netbox/templates/dcim/buttons/bulk_disconnect.html b/netbox/templates/dcim/buttons/bulk_disconnect.html
index 9ab53472b..0c9a5fc16 100644
--- a/netbox/templates/dcim/buttons/bulk_disconnect.html
+++ b/netbox/templates/dcim/buttons/bulk_disconnect.html
@@ -1,3 +1,3 @@
-<button type="submit" name="_disconnect" {% formaction %}="{{ url }}" class="btn btn-red">
+<button type="submit" name="_disconnect" {% formaction %}="{{ url }}{% if return_url %}?return_url={{ return_url }}{% endif %}" class="btn btn-red">
   <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> {{ label }}
 </button>
diff --git a/netbox/templates/generic/object_children.html b/netbox/templates/generic/object_children.html
index b9eabdc9d..da3ce9814 100644
--- a/netbox/templates/generic/object_children.html
+++ b/netbox/templates/generic/object_children.html
@@ -35,7 +35,7 @@ Context:
         </div>
         <div class="d-print-none mt-2">
             {% block bulk_controls %}
-              {% action_buttons actions model multi=True %}
+              {% action_buttons actions model multi=True return_url=request.path %}
               {% block bulk_extra_controls %}{% endblock %}
             {% endblock bulk_controls %}
         </div>
diff --git a/netbox/utilities/templates/buttons/bulk_delete.html b/netbox/utilities/templates/buttons/bulk_delete.html
index 42dd7ce30..64673d53c 100644
--- a/netbox/utilities/templates/buttons/bulk_delete.html
+++ b/netbox/utilities/templates/buttons/bulk_delete.html
@@ -1,3 +1,3 @@
-<button type="submit" name="_delete" {% formaction %}="{{ url }}" class="btn btn-red">
+<button type="submit" name="_delete" {% formaction %}="{{ url }}{% if return_url %}?return_url={{ return_url }}{% endif %}" class="btn btn-red">
   <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {{ label }}
 </button>
diff --git a/netbox/utilities/templates/buttons/bulk_edit.html b/netbox/utilities/templates/buttons/bulk_edit.html
index bc50d9b6e..78fc8070d 100644
--- a/netbox/utilities/templates/buttons/bulk_edit.html
+++ b/netbox/utilities/templates/buttons/bulk_edit.html
@@ -1,3 +1,3 @@
-<button type="submit" name="_edit" {% formaction %}="{{ url }}" class="btn btn-yellow">
+<button type="submit" name="_edit" {% formaction %}="{{ url }}{% if return_url %}?return_url={{ return_url }}{% endif %}" class="btn btn-yellow">
   <i class="mdi mdi-pencil" aria-hidden="true"></i> {{ label }}
 </button>
diff --git a/netbox/utilities/templates/buttons/bulk_rename.html b/netbox/utilities/templates/buttons/bulk_rename.html
index 6e268cc62..b7d3d7c3b 100644
--- a/netbox/utilities/templates/buttons/bulk_rename.html
+++ b/netbox/utilities/templates/buttons/bulk_rename.html
@@ -1,5 +1,5 @@
 {% if url %}
-  <button type="submit" name="_rename" {% formaction %}="{{ url }}" class="btn btn-yellow">
+  <button type="submit" name="_rename" {% formaction %}="{{ url }}{% if return_url %}?return_url={{ return_url }}{% endif %}" class="btn btn-yellow">
     <i class="mdi mdi-pencil" aria-hidden="true"></i> {{ label }}
   </button>
 {% endif %}