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

Fix count & create device link in global MIB association table

Browse Source
This commit is contained in:
Paul Gear
2015-12-06 19:26:32 +10:00
parent 6fae9874b0
commit ce880a6d23
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
html/includes/table/device_mibs.inc.php
View File

@ -31,6 +31,7 @@ if (isset($_POST['device_id'])) {
$sql = 'SELECT * FROM `device_mibs`'; $sql = 'SELECT * FROM `device_mibs`';
$wheresql = ' WHERE `device_id` = ?'; $wheresql = ' WHERE `device_id` = ?';
$sortcolumns = 3; $sortcolumns = 3;
$count_sql = "SELECT COUNT(*) FROM `device_mibs`".$wheresql;
} }
else { else {
// device_id not supplied - get details for a all devices // device_id not supplied - get details for a all devices
@ -40,6 +41,7 @@ else {
$wheresql = ' WHERE `d`.`device_id` = `dm`.`device_id`'; $wheresql = ' WHERE `d`.`device_id` = `dm`.`device_id`';
array_unshift($columns, 'hostname'); array_unshift($columns, 'hostname');
$sortcolumns = 4; $sortcolumns = 4;
$count_sql = "SELECT COUNT(*) FROM `devices` `d`, `device_mibs` `dm`".$wheresql;
} }
// all columns are searchable - search across them // all columns are searchable - search across them
@ -50,7 +52,6 @@ if (isset($searchPhrase) && !empty($searchPhrase)) {
$sql .= $wheresql; $sql .= $wheresql;
// get total // get total
$count_sql = "SELECT COUNT(*) FROM `device_mibs`".$wheresql;
$total = dbFetchCell($count_sql, $params); $total = dbFetchCell($count_sql, $params);
if (empty($total)) { if (empty($total)) {
$total = 0; $total = 0;
@ -78,6 +79,11 @@ foreach (dbFetchRows($sql, $params) as $mib) {
foreach ($columns as $col) { foreach ($columns as $col) {
$mibrow[$col] = $mib[$col]; $mibrow[$col] = $mib[$col];
} }
if (!isset($_POST['device_id'])) {
$device = device_by_id_cache($mib['device_id']);
$mibrow['hostname'] = generate_device_link($device,
$mib['hostname'], array('tab' => 'mib'));
}
$response[] = $mibrow; $response[] = $mibrow;
} }