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

Use a subselect instead of inner join because the inner join won't return monitors that don't have a group

pull/2725/head
Isaac Connor 2019-09-20 10:37:19 -04:00
parent a8cbe7d10d
commit 0d19b0dc85
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/skins/classic/views/control.php
View File

@ -26,18 +26,19 @@ if ( !canView('Control') ) {
$params = array(); $params = array();
$groupSql = ''; $groupSql = '';
if ( !empty($_REQUEST['group']) ) { if ( !empty($_REQUEST['group']) ) {
$groupSql = ' AND gm.GroupId = :groupid'; $groupSql = ' AND (m.Id IN (SELECT MonitorID FROM Groups_Monitors WHERE GroupId = :groupid))';
$params[':groupid'] = $_REQUEST['group']; $params[':groupid'] = $_REQUEST['group'];
} }
$mid = !empty($_REQUEST['mid']) ? validInt($_REQUEST['mid']) : 0; $mid = !empty($_REQUEST['mid']) ? validInt($_REQUEST['mid']) : 0;
$sql = "SELECT m.* FROM Monitors m INNER JOIN Groups_Monitors AS gm ON m.Id = gm.MonitorId WHERE m.Function != 'None' AND m.Controllable = 1$groupSql ORDER BY Sequence"; $sql = "SELECT m.* FROM Monitors m WHERE m.Function != 'None' AND m.Controllable = 1$groupSql ORDER BY Sequence";
$mids = array(); $mids = array();
foreach ( dbFetchAll($sql, false, $params) as $row ) { foreach ( dbFetchAll($sql, false, $params) as $row ) {
if ( !visibleMonitor($row['Id']) ) { if ( !visibleMonitor($row['Id']) ) {
continue; continue;
} }
ZM\Logger::Debug(print_r($row,true));
if ( empty($mid) ) if ( empty($mid) )
$mid = $row['Id']; $mid = $row['Id'];
$mids[$row['Id']] = $row['Name']; $mids[$row['Id']] = $row['Name'];