From 316e3780b059052977a46993b04bee7ee084ab49 Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <emiller@cpan.org>
Date: Sun, 26 Jan 2014 10:02:29 -0500
Subject: [PATCH] [#86] Use Vendor abbrevs to enhance node display in device
 port view

---
 Netdisco/Changes                                     | 7 +++++++
 Netdisco/lib/App/Netdisco/Web/Device.pm              | 1 +
 Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm | 6 +++++-
 Netdisco/share/views/ajax/device/ports.tt            | 7 +++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 42304b68..6468d7f5 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,10 @@
+2.022001 - 
+
+  [NEW FEATURES]
+
+  * [#86] Use Vendor abbrevs to enhance node display in device port view 
+
+
 2.022000 - 2014-01-26
 
   [NEW FEATURES]
diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm
index 3b06abd0..9eb0b61c 100644
--- a/Netdisco/lib/App/Netdisco/Web/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Device.pm
@@ -49,6 +49,7 @@ hook 'before' => sub {
     { name => 'n_age',      label => 'Age Stamp',     default => ''   },
     { name => 'n_ip',       label => 'IP Address',    default => 'on' },
     { name => 'n_ssid',     label => 'SSID',          default => 'on' },
+    { name => 'n_vendor',   label => 'Vendor',        default => ''   },
     { name => 'n_archived', label => 'Archived Data', default => ''   },
   ]);
 
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
index 15a63233..c26b9270 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
@@ -139,7 +139,11 @@ get '/ajax/content/device/ports' => require_login sub {
 
     # retrieve wireless SSIDs, if asked for
     $set = $set->search_rs({}, { prefetch => [{$nodes_name => 'wireless'}] })
-      if param('c_nodes');
+      if param('c_nodes') && param('n_ssid');
+
+    # retrieve vendor, if asked for
+    $set = $set->search_rs({}, { prefetch => [{$nodes_name => 'oui'}] })
+      if param('c_nodes') && param('n_vendor');
 
     # retrieve neighbor devices, if asked for
     $set = $set->search_rs({}, { prefetch => [{neighbor_alias => 'device'}] })
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index a3269099..5d952fb7 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -282,6 +282,13 @@
             [% END %]
             )
           [% END %]
+          [% IF params.n_vendor AND node.oui.defined %]
+            (Vendor:
+            [% FOREACH oui IN node.oui %]
+              [%+ oui.abbrev | html_entity %]
+            [% END %]
+            )
+          [% END %]
           [% ' (' _ node.time_last_age _ ')' IF params.n_age %]
           [% IF params.n_ip %]
             [% FOREACH ip IN node.ips %]