From 86d02cc0888a5a8be713eb51f806deb67bbc1db0 Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Wed, 11 Jun 2014 18:26:14 -0400 Subject: [PATCH] Add oui abbrev field to node search results for linking --- Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm | 1 + Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm index 405dd01f..22202dbc 100644 --- a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm +++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm @@ -12,6 +12,7 @@ my $search_attr = { order_by => {'-desc' => 'time_last'}, '+columns' => [ 'oui.company', + 'oui.abbrev', { time_first_stamp => \"to_char(time_first, 'YYYY-MM-DD HH24:MI')" }, { time_last_stamp => \"to_char(time_last, 'YYYY-MM-DD HH24:MI')" }, ], diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm index 7e20aae2..4419b3a3 100644 --- a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm +++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Node.pm @@ -66,6 +66,7 @@ ajax '/ajax/content/search/node' => require_login sub { order_by => {'-desc' => 'time_last'}, '+columns' => [ 'oui.company', + 'oui.abbrev', { time_first_stamp => \"to_char(time_first, 'YYYY-MM-DD HH24:MI')" }, { time_last_stamp => \"to_char(time_last, 'YYYY-MM-DD HH24:MI')" }, ], @@ -77,6 +78,7 @@ ajax '/ajax/content/search/node' => require_login sub { order_by => {'-desc' => 'time_last'}, '+columns' => [ 'oui.company', + 'oui.abbrev', { time_first_stamp => \"to_char(time_first, 'YYYY-MM-DD HH24:MI')" }, { time_last_stamp => \"to_char(time_last, 'YYYY-MM-DD HH24:MI')" }, ], @@ -91,6 +93,7 @@ ajax '/ajax/content/search/node' => require_login sub { { order_by => { '-desc' => 'time_last' }, '+columns' => [ 'oui.company', + 'oui.abbrev', { time_last_stamp => \"to_char(time_last, 'YYYY-MM-DD HH24:MI')" }],