From c0022e79247eb9135f81fa0cc767a8f5eaacb016 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Thu, 30 Jul 2015 17:09:32 +0100 Subject: [PATCH] [#243] Node search results do not include &prefer=port (R. Kerr) --- Netdisco/Changes | 1 + Netdisco/share/views/ajax/search/node_by_ip.tt | 2 +- Netdisco/share/views/ajax/search/node_by_mac.tt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index 312b7035..dc82b463 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -3,6 +3,7 @@ [BUG FIXES] * Skip VLANs undef or zero (reported by Brian van Baekel) + * [#243] Node search results do not include &prefer=port (R. Kerr) 2.032006 - 2015-07-18 diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt index e91df02d..9abab841 100644 --- a/Netdisco/share/views/ajax/search/node_by_ip.tt +++ b/Netdisco/share/views/ajax/search/node_by_ip.tt @@ -105,7 +105,7 @@ Switch Port + href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on&prefer=port"> [% node.switch | html_entity %] - [% node.port | html_entity %] [% ' ' IF NOT node.active %] [% IF node.device.dns AND node.device_port AND node.device_port.name %] diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt index b54a24cd..ce61b5ed 100644 --- a/Netdisco/share/views/ajax/search/node_by_mac.tt +++ b/Netdisco/share/views/ajax/search/node_by_mac.tt @@ -45,7 +45,7 @@ Switch Port - + [% node.switch | html_entity %] - [% node.port | html_entity %] [% '  ' IF NOT node.active %] [% IF node.device.dns AND node.device_port AND node.device_port.name %]