From 639c5e80520d27a4dff48fc8121b45d91c44d398 Mon Sep 17 00:00:00 2001
From: TomasNeuner <tomas.neuner@acds.at>
Date: Tue, 19 Aug 2025 18:29:17 +0200
Subject: [PATCH 1/2] add optional return_url parameter to "Add" button, used
 by missing_prerequisites.html to return user back to initial page

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

diff --git a/netbox/templates/inc/missing_prerequisites.html b/netbox/templates/inc/missing_prerequisites.html
index 7a28a7fe060..89d2f16ef3c 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 df257b5d261..3f6fe3b976b 100644
--- a/netbox/utilities/templates/buttons/add.html
+++ b/netbox/utilities/templates/buttons/add.html
@@ -1,6 +1,10 @@
 {% 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 %}
+    {% if return_url %}
+        <a href="{{ url }}?return_url={{ return_url }}" type="button" class="btn btn-primary">
+    {% else %}
+        <a href="{{ url }}" type="button" class="btn btn-primary">
+    {% endif %}
+<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 d38c8863f7e..176ff4504d5 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,
     }
 
 

From 79533e199e8b2352952ff1f257ea27da8ffbfd2a Mon Sep 17 00:00:00 2001
From: TomasNeuner <tomas.neuner@acds.at>
Date: Wed, 20 Aug 2025 09:17:01 +0200
Subject: [PATCH 2/2] simplified return_url if condition

---
 netbox/utilities/templates/buttons/add.html | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/netbox/utilities/templates/buttons/add.html b/netbox/utilities/templates/buttons/add.html
index 3f6fe3b976b..27804685209 100644
--- a/netbox/utilities/templates/buttons/add.html
+++ b/netbox/utilities/templates/buttons/add.html
@@ -1,10 +1,6 @@
 {% if url %}
     {% load i18n %}
-    {% if return_url %}
-        <a href="{{ url }}?return_url={{ return_url }}" type="button" class="btn btn-primary">
-    {% else %}
-        <a href="{{ url }}" type="button" class="btn btn-primary">
-    {% endif %}
-<i class="mdi mdi-plus-thick"></i> {% trans "Add" %}
-</a>
+    <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