From 8b22bf6c0d314eef56107c3123afefdce413a256 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sun, 22 Sep 2013 18:20:31 +0100
Subject: [PATCH] remove collision in "vendor" param name

---
 Netdisco/share/views/ajax/search/node_by_ip.tt  | 8 ++++----
 Netdisco/share/views/ajax/search/node_by_mac.tt | 8 ++++----
 Netdisco/share/views/sidebar/search/node.tt     | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Netdisco/share/views/ajax/search/node_by_ip.tt b/Netdisco/share/views/ajax/search/node_by_ip.tt
index fbe15b58..4bcfae55 100644
--- a/Netdisco/share/views/ajax/search/node_by_ip.tt
+++ b/Netdisco/share/views/ajax/search/node_by_ip.tt
@@ -2,7 +2,7 @@
   <thead>
     <tr>
       <th>MAC</th>
-      [% IF params.vendor %]
+      [% IF params.show_vendor %]
       <th>Vendor</th>
       [% END %]
       <th>Match</th>
@@ -19,7 +19,7 @@
       <td><a class="nd_linkcell"
         href="[% search_node %]&q=[% row.net_mac.$mac_format_call | uri %]">
           [% row.net_mac.$mac_format_call | html_entity %]</a></td>
-      [% IF params.vendor %]
+      [% IF params.show_vendor %]
       <td>[% row.oui.company | html_entity %]</td>
       [% END %]
       <td>IP &rarr; MAC</td>
@@ -35,7 +35,7 @@
     [% FOREACH node IN row.node_sightings(archive_filter) %]
     <tr>
       <td>&nbsp;</td>
-      [% IF params.vendor %]
+      [% IF params.show_vendor %]
       <td>&nbsp;</td>
       [% END %]
       <td>Switch Port</td>
@@ -56,7 +56,7 @@
     [% FOREACH nodeip IN row.ip_aliases(archive_filter) %]
     <tr>
       <td>&nbsp;</td>
-      [% IF params.vendor %]
+      [% IF params.show_vendor %]
       <td>&nbsp;</td>
       [% END %]
       <td>MAC &rarr; IP</td>
diff --git a/Netdisco/share/views/ajax/search/node_by_mac.tt b/Netdisco/share/views/ajax/search/node_by_mac.tt
index 7c6e489e..92c4ac28 100644
--- a/Netdisco/share/views/ajax/search/node_by_mac.tt
+++ b/Netdisco/share/views/ajax/search/node_by_mac.tt
@@ -2,7 +2,7 @@
   <thead>
     <tr>
       <th>MAC</th>
-      [% IF params.vendor %]
+      [% IF params.show_vendor %]
       <th>Vendor</th>
       [% END %]
       <th>Match</th>
@@ -26,7 +26,7 @@
         &nbsp;
         [% END %]
       </a>
-      [% IF params.vendor %]
+      [% IF params.show_vendor %]
       <td>
         [% IF first_row %]
         [% row.oui.company | html_entity %]
@@ -58,7 +58,7 @@
         &nbsp;
         [% END %]
       </td>
-      [% IF params.vendor %]
+      [% IF params.show_vendor %]
       <td>
         [% IF first_row %]
         [% node.oui.company | html_entity %]
@@ -93,7 +93,7 @@
         &nbsp;
         [% END %]
       </td>
-      [% IF params.vendor %]
+      [% IF params.show_vendor %]
       <td>
         [% IF first_row %]
         [% port.oui.company | html_entity %]
diff --git a/Netdisco/share/views/sidebar/search/node.tt b/Netdisco/share/views/sidebar/search/node.tt
index 0d53105d..64496f07 100644
--- a/Netdisco/share/views/sidebar/search/node.tt
+++ b/Netdisco/share/views/sidebar/search/node.tt
@@ -12,10 +12,10 @@
             </div>
             <div class="clearfix input-prepend">
               <label class="add-on">
-                <input type="checkbox" id="vendor"
-                  name="vendor"[% ' checked="checked"' IF params.vendor %]/>
+                <input type="checkbox" id="show_vendor"
+                  name="show_vendor"[% ' checked="checked"' IF params.show_vendor %]/>
               </label>
-              <label class="nd_checkboxlabel" for="vendor">
+              <label class="nd_checkboxlabel" for="show_vendor">
                 <span class="nd_searchcheckbox uneditable-input">Vendor</span>
               </label>
             </div>