diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 19c139e9d..ca6f1b926 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -159,6 +159,7 @@ class PrefixBriefTable(BaseTable): class Meta(BaseTable.Meta): model = Prefix fields = ('prefix', 'status', 'site', 'role') + orderable = False # diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index b99438a02..3e8a9e64c 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -48,10 +48,11 @@ def vrf(request, pk): vrf = get_object_or_404(VRF.objects.all(), pk=pk) prefixes = Prefix.objects.filter(vrf=vrf) + prefix_table = tables.PrefixBriefTable(prefixes) return render(request, 'ipam/vrf.html', { 'vrf': vrf, - 'prefixes': prefixes, + 'prefix_table': prefix_table, }) @@ -528,10 +529,11 @@ def vlan(request, pk): vlan = get_object_or_404(VLAN.objects.select_related('site', 'role'), pk=pk) prefixes = Prefix.objects.filter(vlan=vlan) + prefix_table = tables.PrefixBriefTable(prefixes) return render(request, 'ipam/vlan.html', { 'vlan': vlan, - 'prefixes': prefixes, + 'prefix_table': prefix_table, }) diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 111f28eda..55aab7b8a 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -118,26 +118,7 @@
Prefixes
- {% if prefixes %} - - {% for p in prefixes %} - - - - - - - {% endfor %} -
- {{ p }} - - {% if p.site %} - {{ p.site }} - {% endif %} - {{ p.get_status_display }}{{ p.role }}
- {% else %} -
None
- {% endif %} + {% render_table prefix_table %} diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index 5f357dd01..57fef8d43 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -96,26 +96,7 @@
Prefixes
- {% if prefixes %} - - {% for p in prefixes %} - - - - - - - {% endfor %} -
- {{ p }} - - {% if p.site %} - {{ p.site }} - {% endif %} - {{ p.status }}{{ p.role }}
- {% else %} -
None
- {% endif %} + {% render_table prefix_table %}