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

Merge branch 'master' of github.com:ZoneMinder/zoneminder

pull/3905/head
Isaac Connor 2024-03-25 09:53:33 -04:00
parent 7f74de5d91 357650d62c
commit 66fa612d02
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,16 +252,18 @@ ob_start();
<?php } <?php }
foreach ( array_keys($eventCounts) as $i ) { foreach ( array_keys($eventCounts) as $i ) {
$filter = addFilterTerm( $filter = addFilterTerm(
$eventCounts[$i]['filter'], $eventCounts[$i]['filter'],
count($eventCounts[$i]['filter']['Query']['terms']), count($eventCounts[$i]['filter']['Query']['terms']),
array( gettype ($_SESSION['MonitorId']) == "array" #Add monitors to the filter only if they are selected in select
'cnj'=>'and', ? array(
'attr'=>'Monitor', 'cnj'=>'and',
'op'=>'IN', 'attr'=>'Monitor',
'val'=>implode(',', $displayMonitorIds) 'op'=>'IN',
) 'val'=>implode(',', $displayMonitorIds)
); )
: false
);
parseFilter($filter); parseFilter($filter);
echo '<th class="colEvents"><a ' echo '<th class="colEvents"><a '
.(canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$filter['querystring'].'">' : '') .(canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$filter['querystring'].'">' : '')

1
web/skins/classic/views/js/event.js.php
View File

@ -112,4 +112,5 @@ var translate = {
"Exit Fullscreen": "<?php echo translate('Exit Fullscreen') ?>", "Exit Fullscreen": "<?php echo translate('Exit Fullscreen') ?>",
"Live": "<?php echo translate('Live') ?>", "Live": "<?php echo translate('Live') ?>",
"Edit": "<?php echo translate('Edit') ?>", "Edit": "<?php echo translate('Edit') ?>",
"All Events": "<?php echo translate('All Events') ?>",
}; };