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

Merge branch 'master' of ssh://git.code.sf.net/p/netdisco/netdisco-ng

Browse Source
This commit is contained in:
Eric A. Miller
2014-01-20 22:02:15 -05:00
parent 053b0a65fa 520d94bb6f
commit 9ed92c85f7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -12,6 +12,7 @@
[BUG FIXES] [BUG FIXES]
* [#85] device property in _no/_only fails with error (R. Kerr) * [#85] device property in _no/_only fails with error (R. Kerr)
* Also prefer port filter when linking to connected devices
2.021001 2.021001

2
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -240,7 +240,7 @@
<i class="icon-signal"></i>&nbsp; <i class="icon-signal"></i>&nbsp;
[% END %] [% END %]
<a href="[% uri_for('/device', <a href="[% uri_for('/device',
self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]"> self_options) %]&q=[% row.neighbor.dns || row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]&prefer=port">
[% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %] [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]
[% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/> [% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/>
[% IF params.neigh_id and (row.remote_id or row.remote_type) %] [% IF params.neigh_id and (row.remote_id or row.remote_type) %]