ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use Monitor instead of MonitorId when loading event counts

pull/3646/head
Isaac Connor 2022-12-05 12:28:50 -05:00
parent ff756591c9
commit 6f45e6cd23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/skins/classic/views/console.php
View File

@ -141,7 +141,7 @@ for ( $i = 0; $i < count($displayMonitors); $i++ ) {
$filter = addFilterTerm(
$eventCounts[$j]['filter'],
count($eventCounts[$j]['filter']['Query']['terms']),
array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'=', 'val'=>$monitor['Id'])
array('cnj'=>'and', 'attr'=>'Monitor', 'op'=>'=', 'val'=>$monitor['Id'])
);
parseFilter($filter);
#$counts[] = 'count(if(1'.$filter['sql'].",1,NULL)) AS EventCount$j, SUM(if(1".$filter['sql'].",DiskSpace,NULL)) As DiskSpace$j";
@ -425,7 +425,7 @@ for ($monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1) {
count($eventCounts[$i]['filter']['Query']['terms']),
array(
'cnj'=>'and',
'attr'=>'MonitorId',
'attr'=>'Monitor',
'op'=>'IN',
'val'=>implode(',',array_map(function($m){return $m['Id'];}, $displayMonitors))
)