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

[#244] Node search results doesnt include on vlan X

Browse Source
This commit is contained in:
Oliver Gorwits
2015-07-30 17:30:16 +01:00
parent c0022e7924
commit 124e43ebe8
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/Changes
View File

@@ -1,5 +1,9 @@
2.032007 - 2015-0 2.032007 - 2015-0
[ENHANCEMENTS]
* [#244] Node search results doesn't include "(on vlan X)" (R. Kerr)
[BUG FIXES] [BUG FIXES]
* Skip VLANs undef or zero (reported by Brian van Baekel) * Skip VLANs undef or zero (reported by Brian van Baekel)

1
Netdisco/share/views/ajax/search/node_by_ip.tt
View File

@@ -111,6 +111,7 @@
[% IF node.device.dns AND node.device_port AND node.device_port.name %] [% IF node.device.dns AND node.device_port AND node.device_port.name %]
([% node.device.dns | html_entity %] - [% node.device_port.name | html_entity %]) ([% node.device.dns | html_entity %] - [% node.device_port.name | html_entity %])
[% END %] [% END %]
on vlan [% node.vlan %]
</td> </td>
[% IF params.stamps %] [% IF params.stamps %]
<td>[% node.time_first_stamp | html_entity %]</td> <td>[% node.time_first_stamp | html_entity %]</td>

1
Netdisco/share/views/ajax/search/node_by_mac.tt
View File

@@ -51,6 +51,7 @@
[% IF node.device.dns AND node.device_port AND node.device_port.name %] [% IF node.device.dns AND node.device_port AND node.device_port.name %]
([% node.device.dns | html_entity %] - [% node.device_port.name | html_entity %]) ([% node.device.dns | html_entity %] - [% node.device_port.name | html_entity %])
[% END %] [% END %]
on vlan [% node.vlan %]
</td> </td>
[% IF params.stamps %] [% IF params.stamps %]
<td>[% node.time_first_stamp | html_entity %]</td> <td>[% node.time_first_stamp | html_entity %]</td>