From 0806a3c32179aded273d6fc72dac0c833510bf5d Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Fri, 2 Mar 2018 13:00:55 +0000
Subject: [PATCH] cleaner display for remote phones and aps without SNMP

---
 lib/App/Netdisco/Web/Device.pm   |  5 +++++
 share/views/ajax/device/ports.tt | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/App/Netdisco/Web/Device.pm b/lib/App/Netdisco/Web/Device.pm
index 143389b8..d19259f4 100644
--- a/lib/App/Netdisco/Web/Device.pm
+++ b/lib/App/Netdisco/Web/Device.pm
@@ -7,6 +7,7 @@ use Dancer::Plugin::Auth::Extensible;
 
 use URI ();
 use URL::Encode 'url_params_mixed';
+use App::Netdisco::Util::Device 'match_devicetype';
 
 # build view settings for port connected nodes and devices
 set('connected_properties' => [
@@ -17,6 +18,10 @@ set('connected_properties' => [
 
 hook 'before_template' => sub {
   my $tokens = shift;
+
+  # allow checking of discoverability of remote connected device
+  $tokens->{has_snmp} = sub { not match_devicetype(shift, 'discover_no_type') };
+
   my $defaults = var('sidebar_defaults')->{'device_ports'}
     or return;
 
diff --git a/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt
index fbfd7456..7155a024 100644
--- a/share/views/ajax/device/ports.tt
+++ b/share/views/ajax/device/ports.tt
@@ -274,7 +274,7 @@
             [% END %]
             <a href="[% device_ports %]&q=[% row.get_column('neighbor_ip') | uri %]">
                 [% row.get_column('neighbor_dns').remove(settings.domain_suffix) || row.get_column('neighbor_ip') | html_entity %]</a>
-            [% IF row.remote_port %]
+            [% IF row.remote_port and has_snmp(row.remote_type) %]
                 -
                 <a href="[% device_ports %]&q=[% row.get_column('neighbor_ip') | uri %]&f=[% row.remote_port | uri %]&prefer=port">
                     [% row.remote_port | html_entity %]</a>
@@ -288,7 +288,7 @@
               [% ' type: '_ row.remote_type IF row.remote_type %])<br/>
             [% END %]
           [% ELSIF row.remote_ip %]
-            <i class="icon-unlink text-error"></i>&nbsp;
+            [% '<i class="icon-unlink text-error"></i>&nbsp;' IF has_snmp(row.remote_type) %]
             [% IF row.remote_is_phone %]
               <i class="icon-phone"></i>&nbsp;
             [% ELSIF row.remote_is_wap %]
@@ -296,7 +296,10 @@
             [% END %]
             <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
               [% row.remote_ip | html_entity %]
-              [% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/>
+              [% IF row.remote_port and has_snmp(row.remote_type) %]
+                - [% row.remote_port | html_entity %]
+              [% END %]
+            </a><br/>
             [% IF params.n_inventory and row.remote_inventory %]
               [% row.remote_inventory %]<br/>
             [% END %]
@@ -305,7 +308,7 @@
               [% ' type: '_ row.remote_type IF row.remote_type %])<br/>
             [% END %]
           [% ELSE %]
-            <i class="icon-unlink text-error"></i>&nbsp; (possible uplink)
+            [% '<i class="icon-unlink text-error"></i>&nbsp; (possible uplink)' IF has_snmp(row.remote_type) %]
           [% END %]
         [% END %]
         [% IF params.c_nodes %]