From bb046f036e07d504676e17f0b966e6f498adafc3 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 19 Jun 2023 21:28:23 +0100 Subject: [PATCH] tune the portvlanmismatch and include domain name in report view --- lib/App/Netdisco/DB/Result/Virtual/PortVLANMismatch.pm | 4 ++-- share/views/ajax/report/portvlanmismatch.tt | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/App/Netdisco/DB/Result/Virtual/PortVLANMismatch.pm b/lib/App/Netdisco/DB/Result/Virtual/PortVLANMismatch.pm index 8b282ba6..ae38a914 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/PortVLANMismatch.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/PortVLANMismatch.pm @@ -60,7 +60,7 @@ FROM ( ON dpv.ip = dp.ip AND dpv.port = dp.port LEFT JOIN device_ip dip - ON dp.remote_ip = dip.alias + ON dp.remote_ip = dip.alias AND (SELECT count(*) FROM device_ip WHERE alias = dp.remote_ip) = 1 UNION @@ -74,7 +74,7 @@ FROM ( ON dp3.ip = dpv2.ip AND dp3.port = dpv2.port LEFT JOIN device_ip dip2 - ON dp2.remote_ip = dip2.alias + ON dp2.remote_ip = dip2.alias AND (SELECT count(*) FROM device_ip WHERE alias = dp2.remote_ip) = 1 ) alldpv WHERE vlan NOT IN ( ?, ?, ?, ? ) AND remote_ip IS NOT NULL diff --git a/share/views/ajax/report/portvlanmismatch.tt b/share/views/ajax/report/portvlanmismatch.tt index b8846ac6..b39378e0 100644 --- a/share/views/ajax/report/portvlanmismatch.tt +++ b/share/views/ajax/report/portvlanmismatch.tt @@ -20,8 +20,7 @@ $(document).ready(function() { { "data": 'left_ip', "render": function(data, type, row, meta) { - return '' + he.encode(data || '') + '' - + '
' + he.encode(row.left_dns || ''); } + return '' + he.encode(row.left_dns || data || '') + ''; } }, { "data": 'left_port', "type": 'portsort', @@ -35,8 +34,7 @@ $(document).ready(function() { }, { "data": 'right_ip', "render": function(data, type, row, meta) { - return '' + he.encode(data || '') + '' - + '
' + he.encode(row.right_dns || ''); } + return '' + he.encode(row.right_dns || data || '') + ''; } }, { "data": 'right_port', "type": 'portsort',