#7113: Add bulk actions under child prefixes view; general cleanup

Author: jeremystretch

netbox/ipam/views.py

@@ -403,8 +403,15 @@ def get_extra_context(self, request, instance):
 
         bulk_querystring = 'vrf_id={}&within={}'.format(instance.vrf.pk if instance.vrf else '0', instance.prefix)
 
+        # Compile permissions list for rendering the object table
+        permissions = {
+            'change': request.user.has_perm('ipam.change_prefix'),
+            'delete': request.user.has_perm('ipam.delete_prefix'),
+        }
+
         return {
             'table': table,
+            'permissions': permissions,
             'bulk_querystring': bulk_querystring,
             'active_tab': 'prefixes',
             'first_available_prefix': instance.get_first_available_prefix(),
@@ -429,7 +436,6 @@ def get_extra_context(self, request, instance):
 
         # Compile permissions list for rendering the object table
         permissions = {
-            'add': request.user.has_perm('ipam.add_iprange'),
             'change': request.user.has_perm('ipam.change_iprange'),
             'delete': request.user.has_perm('ipam.delete_iprange'),
         }
@@ -465,7 +471,6 @@ def get_extra_context(self, request, instance):
 
         # Compile permissions list for rendering the object table
         permissions = {
-            'add': request.user.has_perm('ipam.add_ipaddress'),
             'change': request.user.has_perm('ipam.change_ipaddress'),
             'delete': request.user.has_perm('ipam.delete_ipaddress'),
         }

netbox/templates/ipam/prefix/ip_addresses.html

@@ -3,8 +3,8 @@
 {% load static %}
 
 {% block extra_controls %}
-  {% 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-sm btn-primary">
+  {% 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-sm btn-success">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add IP Address
     </a>
   {% endif %}

netbox/templates/ipam/prefix/prefixes.html

@@ -4,15 +4,9 @@
 
 {% block extra_controls %}
   {% include 'ipam/inc/toggle_available.html' %}
-  {% if perms.ipam.add_prefix and active_tab == 'prefixes' and first_available_prefix %}
+  {% if perms.ipam.add_prefix and first_available_prefix %}
     <a href="{% url 'ipam:prefix_add' %}?prefix={{ first_available_prefix }}&vrf={{ object.vrf.pk }}&site={{ object.site.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-sm btn-success">
-      <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add Child Prefix
-    </a>
-  {% endif %}
-  {% 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-sm btn-success">
-      <span class="mdi mdi-plus-thick" aria-hidden="true"></span>
-      Add Child IP Address
+      <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add Prefix
     </a>
   {% endif %}
   {{ block.super }}