mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed fixing ignored/disabled (#4660)

Browse Source
This commit is contained in:
crcro
2016-09-29 09:37:53 +03:00
committed by Neil Lathwood
parent 714d294222
commit d6f0d819f3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
html/includes/common/availability-map.inc.php
View File

@@ -134,25 +134,25 @@ if (defined('SHOW_SETTINGS')) {
$in_devices = implode(',', $in_devices);
}
if ($show_disabled_ignored == 1) {
$disabled_ignored = ', `D`.`ignore`, `D`.`disabled`';
}
$sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon` '.$disabled_ignored.' FROM `devices` AS `D`';
$sql = 'SELECT `D`.`hostname`, `D`.`sysName`, `D`.`device_id`, `D`.`status`, `D`.`uptime`, `D`.`os`, `D`.`icon`, `D`.`ignore`, `D`.`disabled` FROM `devices` AS `D`';
if (is_normal_user() === true) {
$sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND';
$sql .= ' , `devices_perms` AS P WHERE D.`device_id` = P.`device_id` AND P.`user_id` = ? AND ';
$param = array(
$_SESSION['user_id']
);
} else {
$sql .= ' WHERE';
$sql .= ' WHERE ';
}
if ($show_disabled_ignored != 1) {
$sql .= '`D`.`ignore` = 0 AND `D`.`disabled` = 0 ';
} else {
$sql .= '(`D`.`status` IN (0,1,2) OR `D`.`ignore` = 1 OR `D`.`disabled` = 1)';
}
if ($config['webui']['availability_map_use_device_groups'] != 0 && isset($in_devices)) {
$sql .= " `D`.`device_id` IN (".$in_devices.")";
} else {
$sql .= " TRUE";
$sql .= " AND `D`.`device_id` IN ($in_devices)";
}
$sql .= " ORDER BY `".$deviceOrderBy."`";