From ba9da2d93c844fdf854550ea047bc0dd2888dd85 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 24 Jun 2017 16:59:07 +0100 Subject: [PATCH] #316 Neighbor map should fall back to device sysname after dns --- Changes | 1 + lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 463547e8..6332ad65 100644 --- a/Changes +++ b/Changes @@ -9,6 +9,7 @@ * #320 DNS subroutines are redefined * #318 ACLs with RegExp are very slow - aggressive resolver timeouts * #317 when renumbering on discover, delete likely duplicate devices + * #316 Neighbor map should fall back to device sysname after dns 2.036001 - 2017-06-22 diff --git a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm index ded2d6bc..8a533570 100644 --- a/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm +++ b/lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm @@ -66,9 +66,10 @@ get '/ajax/data/device/netmap' => require_login sub { my @devices = schema('netdisco')->resultset('Device')->search({}, { result_class => 'DBIx::Class::ResultClass::HashRefInflator', - columns => ['ip', 'dns'], + columns => ['ip', 'dns', 'name'], })->all; - var(devices => { map { $_->{ip} => $_->{dns} } @devices }); + var(devices => { map { $_->{ip} => lc($_->{dns} || $_->{name} || '') } + @devices }); var(links => {}); my $rs = schema('netdisco')->resultset('Virtual::DeviceLinks')->search({}, {