135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaner display for remote phones and aps without SNMP

Browse Source
This commit is contained in:
Oliver Gorwits
2018-03-02 13:00:55 +00:00
parent 7b5f8c76f3
commit 0806a3c321
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/App/Netdisco/Web/Device.pm
View File

@@ -7,6 +7,7 @@ use Dancer::Plugin::Auth::Extensible;
use URI (); use URI ();
use URL::Encode 'url_params_mixed'; use URL::Encode 'url_params_mixed';
use App::Netdisco::Util::Device 'match_devicetype';
# build view settings for port connected nodes and devices # build view settings for port connected nodes and devices
set('connected_properties' => [ set('connected_properties' => [
@@ -17,6 +18,10 @@ set('connected_properties' => [
hook 'before_template' => sub { hook 'before_template' => sub {
my $tokens = shift; 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'} my $defaults = var('sidebar_defaults')->{'device_ports'}
or return; or return;

11
share/views/ajax/device/ports.tt
View File

@@ -274,7 +274,7 @@
[% END %] [% END %]
<a href="[% device_ports %]&q=[% row.get_column('neighbor_ip') | uri %]"> <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> [% 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"> <a href="[% device_ports %]&q=[% row.get_column('neighbor_ip') | uri %]&f=[% row.remote_port | uri %]&prefer=port">
[% row.remote_port | html_entity %]</a> [% row.remote_port | html_entity %]</a>
@@ -288,7 +288,7 @@
[% ' type: '_ row.remote_type IF row.remote_type %])<br/> [% ' type: '_ row.remote_type IF row.remote_type %])<br/>
[% END %] [% END %]
[% ELSIF row.remote_ip %] [% 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 %] [% IF row.remote_is_phone %]
<i class="icon-phone"></i>&nbsp; <i class="icon-phone"></i>&nbsp;
[% ELSIF row.remote_is_wap %] [% ELSIF row.remote_is_wap %]
@@ -296,7 +296,10 @@
[% END %] [% END %]
<a href="[% search_node %]&q=[% row.remote_ip | uri %]"> <a href="[% search_node %]&q=[% row.remote_ip | uri %]">
[% row.remote_ip | html_entity %] [% 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 %] [% IF params.n_inventory and row.remote_inventory %]
[% row.remote_inventory %]<br/> [% row.remote_inventory %]<br/>
[% END %] [% END %]
@@ -305,7 +308,7 @@
[% ' type: '_ row.remote_type IF row.remote_type %])<br/> [% ' type: '_ row.remote_type IF row.remote_type %])<br/>
[% END %] [% END %]
[% ELSE %] [% 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 %]
[% END %] [% END %]
[% IF params.c_nodes %] [% IF params.c_nodes %]