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

Merge pull request #1210 from SaaldjorMike/fix-memory

Browse Source 
Fixed entry count on memory page
This commit is contained in:
Daniel Preussker
2015-06-08 14:03:48 +00:00
parent d89525f3dd f1c13d1e3d
commit 225a84d597
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,9 @@ if (isset($searchPhrase) && !empty($searchPhrase)) {
$sql .= " AND (`hostname` LIKE '%$searchPhrase%' OR `mempool_descr` LIKE '%$searchPhrase%')"; $sql .= " AND (`hostname` LIKE '%$searchPhrase%' OR `mempool_descr` LIKE '%$searchPhrase%')";
} }
$count_sql = "SELECT COUNT(`mempool_id`) $sql"; $count_sql = "SELECT COUNT(`mempool_id`) $sql";
$total = dbFetchCell($count_sql,$param); $count = dbFetchCell($count_sql,$param);
if (empty($total)) { if (empty($count)) {
$total = 0; $count = 0;
} }
if (!isset($sort) || empty($sort)) { if (!isset($sort) || empty($sort)) {
$sort = '`D`.`hostname`, `M`.`mempool_descr`'; $sort = '`D`.`hostname`, `M`.`mempool_descr`';
@ -68,5 +68,5 @@ foreach (dbFetchRows($sql,$param) as $mempool) {
'mempool_perc' => ''); 'mempool_perc' => '');
} # endif graphs } # endif graphs
} }
$output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$total); $output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$count);
echo _json_encode($output); echo _json_encode($output);