From db1786c3850390d48501db89b724554a2ffc6fc4 Mon Sep 17 00:00:00 2001
From: Tomas Neuner <31988980+9er-tom@users.noreply.github.com>
Date: Wed, 20 Aug 2025 18:04:00 +0200
Subject: [PATCH] Fixes #19990: add optional return_url parameter to "Add"
 button for missing prerequisites (#20128)

---
 netbox/templates/inc/missing_prerequisites.html |  2 +-
 netbox/utilities/templates/buttons/add.html     | 10 +++++-----
 netbox/utilities/templatetags/buttons.py        |  3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/netbox/templates/inc/missing_prerequisites.html b/netbox/templates/inc/missing_prerequisites.html
index 7a28a7fe0..89d2f16ef 100644
--- a/netbox/templates/inc/missing_prerequisites.html
+++ b/netbox/templates/inc/missing_prerequisites.html
@@ -10,7 +10,7 @@
       {% endblocktrans %}
     </div>
     <div>
-      {% add_button prerequisite_model %}
+      {% add_button prerequisite_model request.path %}
     </div>
   </div>
 </div>
diff --git a/netbox/utilities/templates/buttons/add.html b/netbox/utilities/templates/buttons/add.html
index df257b5d2..278046852 100644
--- a/netbox/utilities/templates/buttons/add.html
+++ b/netbox/utilities/templates/buttons/add.html
@@ -1,6 +1,6 @@
 {% if url %}
-{% load i18n %}
-  <a href="{{ url }}" type="button" class="btn btn-primary">
-    <i class="mdi mdi-plus-thick"></i> {% trans "Add" %}
-  </a>
-{% endif %}
+    {% load i18n %}
+    <a href="{{ url }}{% if return_url %}?return_url={{ return_url }}{% endif %}" type="button" class="btn btn-primary">
+        <i class="mdi mdi-plus-thick"></i> {% trans "Add" %}
+    </a>
+{% endif %}
\ No newline at end of file
diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py
index d38c8863f..176ff4504 100644
--- a/netbox/utilities/templatetags/buttons.py
+++ b/netbox/utilities/templatetags/buttons.py
@@ -146,7 +146,7 @@ def sync_button(instance):
 #
 
 @register.inclusion_tag('buttons/add.html')
-def add_button(model, action='add'):
+def add_button(model, return_url=None, action='add'):
     try:
         url = reverse(get_viewname(model, action))
     except NoReverseMatch:
@@ -154,6 +154,7 @@ def add_button(model, action='add'):
 
     return {
         'url': url,
+        'return_url': return_url,
     }