diff --git a/Netdisco/Changes b/Netdisco/Changes index dc82b463..c9d1a5c1 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,5 +1,9 @@ 2.032007 - 2015-0 + [ENHANCEMENTS] + + * [#244] Node search results doesn't include "(on vlan X)" (R. Kerr) + [BUG FIXES] * Skip VLANs undef or zero (reported by Brian van Baekel) diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt index 9abab841..759b03c2 100644 --- a/Netdisco/share/views/ajax/search/node_by_ip.tt +++ b/Netdisco/share/views/ajax/search/node_by_ip.tt @@ -111,6 +111,7 @@ [% IF node.device.dns AND node.device_port AND node.device_port.name %] ([% node.device.dns | html_entity %] - [% node.device_port.name | html_entity %]) [% END %] + on vlan [% node.vlan %] [% IF params.stamps %] [% node.time_first_stamp | html_entity %] diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt index ce61b5ed..cb07db8b 100644 --- a/Netdisco/share/views/ajax/search/node_by_mac.tt +++ b/Netdisco/share/views/ajax/search/node_by_mac.tt @@ -51,6 +51,7 @@ [% IF node.device.dns AND node.device_port AND node.device_port.name %] ([% node.device.dns | html_entity %] - [% node.device_port.name | html_entity %]) [% END %] + on vlan [% node.vlan %] [% IF params.stamps %] [% node.time_first_stamp | html_entity %]