From 9827c55863f8b5aa1b592df24d28791de99763fc Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Thu, 28 May 2015 00:55:10 +0000 Subject: [PATCH] Fix the show all devices so it doesn't display duplicates. --- app/devices/devices.php | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/app/devices/devices.php b/app/devices/devices.php index f3570b9cfd..264a9d1464 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -137,27 +137,22 @@ else { //get the list $sql = "select d.*, d2.device_label as alternate_label "; $sql .= "from v_devices as d, v_devices as d2 "; + $sql .= "where ( "; + $sql .= " d.device_uuid_alternate = d2.device_uuid "; + $sql .= " or d.device_uuid_alternate is null and d.device_uuid = d2.device_uuid "; + $sql .= ") "; if ($_GET['showall'] && permission_exists('device_all')) { - if (strlen($search) > 0) { - $sql .= "where "; - } + //echo __line__."
\n"; } else { - $sql .= "where ("; + $sql .= "and ("; $sql .= " d.domain_uuid = '$domain_uuid' "; if (permission_exists('device_all')) { $sql .= " or d.domain_uuid is null "; } $sql .= ") "; - $sql .= "and ( "; - $sql .= " d.device_uuid_alternate = d2.device_uuid "; - $sql .= " or d.device_uuid_alternate is null and d.device_uuid = d2.device_uuid "; - $sql .= ") "; - if (strlen($search) > 0) { - $sql .= "and "; - } } if (strlen($search) > 0) { - $sql .= "("; + $sql .= "and ("; $sql .= " d.device_mac_address like '%".$search."%' "; $sql .= " or d.device_label like '%".$search."%' "; $sql .= " or d.device_vendor like '%".$search."%' ";