From c59c4290f9d0fc03eea735a895aac573ed3de3c2 Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Fri, 30 Apr 2021 09:50:14 -0700
Subject: [PATCH 1/2] Closes #6321: Re-add missing 'Add an IP Address' button
 in prefix view

---
 netbox/templates/ipam/prefix/base.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/netbox/templates/ipam/prefix/base.html b/netbox/templates/ipam/prefix/base.html
index f1d5cbc99..4ebc0a64d 100644
--- a/netbox/templates/ipam/prefix/base.html
+++ b/netbox/templates/ipam/prefix/base.html
@@ -11,6 +11,16 @@
   <li>{{ object }}</li>
 {% endblock %}
 
+{% block buttons %}
+  {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %}
+    <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-success">
+        <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
+        Add an IP Address
+    </a>
+  {% endif %}
+  {{ block.super }}
+{% endblock %}
+
 {% block tabs %}
   <ul class="nav nav-tabs" style="margin-bottom: 20px">
     <li role="presentation"{% if not active_tab %} class="active"{% endif %}>

From f1cdd72575c937efe5f559bed1948b5f3767bdda Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Fri, 30 Apr 2021 12:07:56 -0700
Subject: [PATCH 2/2] move 'Add an IP Address' button to ip_addresses template

---
 netbox/templates/ipam/prefix/base.html         | 10 ----------
 netbox/templates/ipam/prefix/ip_addresses.html | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/netbox/templates/ipam/prefix/base.html b/netbox/templates/ipam/prefix/base.html
index 4ebc0a64d..f1d5cbc99 100644
--- a/netbox/templates/ipam/prefix/base.html
+++ b/netbox/templates/ipam/prefix/base.html
@@ -11,16 +11,6 @@
   <li>{{ object }}</li>
 {% endblock %}
 
-{% block buttons %}
-  {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %}
-    <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-success">
-        <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
-        Add an IP Address
-    </a>
-  {% endif %}
-  {{ block.super }}
-{% endblock %}
-
 {% block tabs %}
   <ul class="nav nav-tabs" style="margin-bottom: 20px">
     <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html
index 43cf6bc9d..5a944150d 100644
--- a/netbox/templates/ipam/prefix/ip_addresses.html
+++ b/netbox/templates/ipam/prefix/ip_addresses.html
@@ -1,5 +1,15 @@
 {% extends 'ipam/prefix/base.html' %}
 
+{% block buttons %}
+  {% if perms.ipam.add_ipaddress and first_available_ip %}
+    <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-success">
+        <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
+        Add an IP Address
+    </a>
+  {% endif %}
+  {{ block.super }}
+{% endblock %}
+
 {% block content %}
   <div class="row">
     <div class="col-md-12">