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

Neighbor device links to both device and port (fragfutter)

Browse Source
This commit is contained in:
Oliver Gorwits
2014-06-18 12:44:35 +01:00
parent 298e7cd892
commit 4c6f08757d
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -5,6 +5,7 @@
* Ignore devices with "phone" in their CDP/LLDP platform description * Ignore devices with "phone" in their CDP/LLDP platform description
* Change log format to contain UTC timestamp * Change log format to contain UTC timestamp
* Link to VLAN search by name from VLAN Inventory report * Link to VLAN search by name from VLAN Inventory report
* Neighbor device links to both device and port (fragfutter)
[BUG FIXES] [BUG FIXES]

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

@@ -19,7 +19,7 @@
[% END %] [% END %]
</tr> </tr>
</thead> </thead>
</tbody> <tbody>
[% FOREACH row IN results %] [% FOREACH row IN results %]
<tr> <tr>
<td class="nd_center-cell nd_devport-icon"> <td class="nd_center-cell nd_devport-icon">
@@ -248,10 +248,14 @@
[% ELSIF row.remote_type AND row.remote_type.match('(cisco\s+AIR-[L|C]?AP|-K9W8-|^AP:\s)') %] [% ELSIF row.remote_type AND row.remote_type.match('(cisco\s+AIR-[L|C]?AP|-K9W8-|^AP:\s)') %]
<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.ip | uri %]">
self_options) %]&q=[% row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]&prefer=port"> [% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %]</a>
[% row.neighbor.dns.remove(settings.domain_suffix) || row.neighbor.ip | html_entity %] [% IF row.remote_port %]
[% ' - ' IF row.remote_port %][% row.remote_port | html_entity %]</a><br/> -
<a href="[% uri_for('/device', self_options) %]&q=[% row.neighbor.ip | uri %]&f=[% row.remote_port | uri %]&prefer=port">
[% row.remote_port | html_entity %]</a>
[% END %]
<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) %]
([% 'id: '_ row.remote_id IF row.remote_id %] ([% 'id: '_ row.remote_id IF row.remote_id %]
[% ' type: '_ row.remote_type IF row.remote_type %])<br/> [% ' type: '_ row.remote_type IF row.remote_type %])<br/>