From 064a400314bfbdfdd10a6b42bddf51d452f93418 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 23 Jan 2017 14:23:42 -0500
Subject: [PATCH] Closes #820: Add VLAN column to parent prefixes table on IP
 address view

---
 netbox/ipam/tables.py | 3 ++-
 netbox/ipam/views.py  | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index f4ceffd60..6c99f7d9e 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -234,11 +234,12 @@ class PrefixBriefTable(BaseTable):
     vrf = tables.LinkColumn('ipam:vrf', args=[Accessor('vrf.pk')], default='Global', verbose_name='VRF')
     site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')], verbose_name='Site')
     status = tables.TemplateColumn(STATUS_LABEL, verbose_name='Status')
+    vlan = tables.LinkColumn('ipam:vlan', args=[Accessor('vlan.pk')], verbose_name='VLAN')
     role = tables.Column(verbose_name='Role')
 
     class Meta(BaseTable.Meta):
         model = Prefix
-        fields = ('prefix', 'vrf', 'status', 'site', 'role')
+        fields = ('prefix', 'vrf', 'status', 'site', 'vlan', 'role')
         orderable = False
 
 
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index a56e691c7..9682dff50 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -406,11 +406,13 @@ def prefix(request, pk):
         .filter(prefix__net_contains=str(prefix.prefix))\
         .select_related('site', 'role').annotate_depth()
     parent_prefix_table = tables.PrefixBriefTable(parent_prefixes)
+    parent_prefix_table.exclude = ('vrf',)
 
     # Duplicate prefixes table
     duplicate_prefixes = Prefix.objects.filter(vrf=prefix.vrf, prefix=str(prefix.prefix)).exclude(pk=prefix.pk)\
         .select_related('site', 'role')
     duplicate_prefix_table = tables.PrefixBriefTable(list(duplicate_prefixes))
+    duplicate_prefix_table.exclude = ('vrf',)
 
     # Child prefixes table
     if prefix.vrf:
@@ -715,6 +717,7 @@ def vlan(request, pk):
     vlan = get_object_or_404(VLAN.objects.select_related('site', 'role'), pk=pk)
     prefixes = Prefix.objects.filter(vlan=vlan).select_related('vrf', 'site', 'role')
     prefix_table = tables.PrefixBriefTable(list(prefixes))
+    prefix_table.exclude = ('vlan',)
 
     return render(request, 'ipam/vlan.html', {
         'vlan': vlan,