From 73862d5ac83fee9490f1a0b873fae91a79e9c6a1 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 17 Aug 2022 06:09:43 -0400 Subject: [PATCH] fix device sysname showing in node search --- lib/App/Netdisco/DB/Result/NodeIp.pm | 2 +- lib/App/Netdisco/Web/Plugin/Search/Node.pm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/App/Netdisco/DB/Result/NodeIp.pm b/lib/App/Netdisco/DB/Result/NodeIp.pm index 5ab5aed0..39d086db 100644 --- a/lib/App/Netdisco/DB/Result/NodeIp.pm +++ b/lib/App/Netdisco/DB/Result/NodeIp.pm @@ -180,7 +180,7 @@ sub node_sightings { return $row ->nodes({}, { - '+columns' => [qw/ device.dns /], + '+columns' => [qw/ device.dns device.name /], join => 'device', }) ->search_rs({}, $search_attr) diff --git a/lib/App/Netdisco/Web/Plugin/Search/Node.pm b/lib/App/Netdisco/Web/Plugin/Search/Node.pm index e8c5a707..ea589099 100644 --- a/lib/App/Netdisco/Web/Plugin/Search/Node.pm +++ b/lib/App/Netdisco/Web/Plugin/Search/Node.pm @@ -136,6 +136,7 @@ get '/ajax/content/search/node' => require_login sub { order_by => {'-desc' => 'time_last'}, '+columns' => [ 'device.dns', + 'device.name', { time_first_stamp => \"to_char(time_first, 'YYYY-MM-DD HH24:MI')" }, { time_last_stamp => \"to_char(time_last, 'YYYY-MM-DD HH24:MI')" }, ],