diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index c8c7d40ca..8484d7a32 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -118,7 +118,6 @@ class VRFListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.VRFFilterSet
filterset_form = forms.VRFFilterForm
table = tables.VRFTable
- template_name = 'ipam/vrf_list.html'
class VRFView(PermissionRequiredMixin, View):
@@ -187,6 +186,7 @@ class RIRListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.RIRFilterSet
filterset_form = forms.RIRFilterForm
table = tables.RIRDetailTable
+ # TODO: Remove custom template
template_name = 'ipam/rir_list.html'
def alter_queryset(self, request):
@@ -293,10 +293,10 @@ class AggregateListView(PermissionRequiredMixin, ObjectListView):
queryset = Aggregate.objects.prefetch_related('rir').annotate(
child_count=RawSQL('SELECT COUNT(*) FROM ipam_prefix WHERE ipam_prefix.prefix <<= ipam_aggregate.prefix', ())
)
-
filterset = filters.AggregateFilterSet
filterset_form = forms.AggregateFilterForm
table = tables.AggregateDetailTable
+ # TODO: Remove custom template
template_name = 'ipam/aggregate_list.html'
def extra_context(self):
@@ -411,7 +411,6 @@ class RoleListView(PermissionRequiredMixin, ObjectListView):
permission_required = 'ipam.view_role'
queryset = Role.objects.all()
table = tables.RoleTable
- template_name = 'ipam/role_list.html'
class RoleCreateView(PermissionRequiredMixin, ObjectEditView):
@@ -449,6 +448,7 @@ class PrefixListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.PrefixFilterSet
filterset_form = forms.PrefixFilterForm
table = tables.PrefixDetailTable
+ # TODO: Remove custom template
template_name = 'ipam/prefix_list.html'
def alter_queryset(self, request):
@@ -644,7 +644,6 @@ class IPAddressListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.IPAddressFilterSet
filterset_form = forms.IPAddressFilterForm
table = tables.IPAddressDetailTable
- template_name = 'ipam/ipaddress_list.html'
class IPAddressView(PermissionRequiredMixin, View):
@@ -817,7 +816,6 @@ class VLANGroupListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.VLANGroupFilterSet
filterset_form = forms.VLANGroupFilterForm
table = tables.VLANGroupTable
- template_name = 'ipam/vlangroup_list.html'
class VLANGroupCreateView(PermissionRequiredMixin, ObjectEditView):
@@ -893,7 +891,6 @@ class VLANListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.VLANFilterSet
filterset_form = forms.VLANFilterForm
table = tables.VLANDetailTable
- template_name = 'ipam/vlan_list.html'
class VLANView(PermissionRequiredMixin, View):
@@ -989,7 +986,7 @@ class ServiceListView(PermissionRequiredMixin, ObjectListView):
filterset = filters.ServiceFilterSet
filterset_form = forms.ServiceFilterForm
table = tables.ServiceTable
- template_name = 'ipam/service_list.html'
+ action_buttons = ('export')
class ServiceView(PermissionRequiredMixin, View):
diff --git a/netbox/templates/ipam/ipaddress_list.html b/netbox/templates/ipam/ipaddress_list.html
deleted file mode 100644
index b7920a434..000000000
--- a/netbox/templates/ipam/ipaddress_list.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends '_base.html' %}
-{% load buttons %}
-
-{% block content %}
-
- {% if perms.ipam.add_ipaddress %}
- {% add_button 'ipam:ipaddress_add' %}
- {% import_button 'ipam:ipaddress_import' %}
- {% endif %}
- {% export_button content_type %}
-
-{% block title %}IP Addresses{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
-
-
- {% include 'inc/search_panel.html' %}
-
-
- {% if perms.ipam.add_role %}
- {% add_button 'ipam:role_add' %}
- {% import_button 'ipam:role_import' %}
- {% endif %}
- {% export_button content_type %}
-
-{% block title %}Prefix/VLAN Roles{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:role_bulk_delete' %}
-
-
- {% export_button content_type %}
-
-{% block title %}Services{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:service_bulk_edit' bulk_delete_url='ipam:service_bulk_delete' %}
-
-
- {% include 'inc/search_panel.html' %}
-
-
- {% if perms.ipam.add_vlan %}
- {% add_button 'ipam:vlan_add' %}
- {% import_button 'ipam:vlan_import' %}
- {% endif %}
- {% export_button content_type %}
-
-{% block title %}VLANs{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:vlan_bulk_edit' bulk_delete_url='ipam:vlan_bulk_delete' %}
-
-
- {% include 'inc/search_panel.html' %}
-
-
- {% if perms.ipam.add_vlangroup %}
- {% add_button 'ipam:vlangroup_add' %}
- {% import_button 'ipam:vlangroup_import' %}
- {% endif %}
- {% export_button content_type %}
-
-{% block title %}VLAN Groups{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:vlangroup_bulk_delete' %}
-
-
- {% include 'inc/search_panel.html' %}
-
-
- {% if perms.ipam.add_vrf %}
- {% add_button 'ipam:vrf_add' %}
- {% import_button 'ipam:vrf_import' %}
- {% endif %}
- {% export_button content_type %}
-
-{% block title %}VRFs{% endblock %}
-
-
- {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:vrf_bulk_edit' bulk_delete_url='ipam:vrf_bulk_delete' %}
-
-
- {% include 'inc/search_panel.html' %}
-
-