From: Nicolas Boisselier Date: Fri, 21 Oct 2016 13:57:25 +0000 (+0100) Subject: ui fix bug on metas X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=e55ab1e7ebda215a260af275da89eac4e9e3d263;p=nb.git ui fix bug on metas --- diff --git a/etc/dbq/ui.php b/etc/dbq/ui.php index bbeefb5c..428f518e 100644 --- a/etc/dbq/ui.php +++ b/etc/dbq/ui.php @@ -98,7 +98,7 @@ $DBQ['_ui'] = array( ." UNION SELECT 'aws_ec2',id FROM aws_ec2 WHERE aws_ec2.idnode=".$Db->quote($r['id']) .($GLOBALS['web'] ? " UNION SELECT 'last_backup',CONCAT('',max(date),'') as v FROM backup WHERE idnode=".$Db->quote($r['id'])." GROUP BY dirs" : "") ." UNION SELECT 'last_run',substr(value,1,10) FROM fact WHERE name = 'last_run' AND idnode=".$Db->quote($r['id'])." AND value < ".$Db->quote(date('Y-m-d', strtotime('-3 days'))) - ." UNION SELECT 'rack',CONCAT(idrack,'/',position) FROM rack_node WHERE idnode=".$Db->quote($r['id'])." OR idnode IN (SELECT idvmware FROM vms WHERE vms.idnode=rack_node.idnode)" + ." UNION SELECT 'rack',CONCAT(idrack,'/',position) FROM rack_node WHERE idnode=".$Db->quote($r['id'])." OR idnode IN (SELECT idvmware FROM vms WHERE vms.idnode=".$Db->quote($r['id']).")" ." UNION SELECT 'switch' as n, CONCAT(id,':',port) as v FROM switch_port WHERE switch_port.idnode=".$Db->quote($r['id'])." AND switch_port.port NOT LIKE 'ch%'" ,PDO::FETCH_NUM) as $f) { $metas[$f[0]] = $f[1]; } if ($metas) {