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

Removed references to location override

Browse Source
This commit is contained in:
laf
2015-07-20 16:52:33 +01:00
parent fbec75a265
commit 031a818c77
9 changed files with 18 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
html/includes/table/devices.inc.php
View File

@@ -78,7 +78,7 @@ if (!empty($_POST['location']) && $_POST['location'] == 'Unset') {
}
if (!empty($_POST['location'])) {
$sql .= " AND (((`DB`.`attrib_value`='1' AND `DA`.`attrib_type`='override_sysLocation_string' AND `DA`.`attrib_value` = ?)) OR `location` = ?)";
$sql .= " AND `location` = ?";
$param[] = mres($_POST['location']);
$param[] = mres($_POST['location']);
}
@@ -167,10 +167,6 @@ foreach (dbFetchRows($sql, $param) as $device) {
$port_count = dbFetchCell('SELECT COUNT(*) FROM `ports` WHERE `device_id` = ?', array($device['device_id']));
$sensor_count = dbFetchCell('SELECT COUNT(*) FROM `sensors` WHERE `device_id` = ?', array($device['device_id']));
if (get_dev_attrib($device, 'override_sysLocation_bool')) {
$device['location'] = get_dev_attrib($device, 'override_sysLocation_string');
}
$actions = ('<div class="row">
<div class="col-xs-1">');
$actions .= '<a href="'.generate_device_url($device).'"> <img src="images/16/server.png" border="0" align="absmiddle" alt="View device" title="View device" /></a> ';