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

Handle case when Alarm frame or MaxScore frame don't exist.

pull/3779/head
Isaac Connor 2023-10-05 12:00:54 -04:00
parent 71ff61b05f
commit 8fd33b7f77
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/api/app/Controller/EventsController.php
View File

@ -170,8 +170,13 @@ class EventsController extends AppController {
$event['Event']['PrevOfMonitor'] = $event_monitor_neighbors['prev']['Event']['Id'];
$this->loadModel('Frame');
$event['Event']['MaxScoreFrameId'] = $this->Frame->findByEventid($id,'FrameId',array('Score'=>'desc','FrameId'=>'asc'))['Frame']['FrameId'];
$event['Event']['AlarmFrameId'] = $this->Frame->findByEventidAndType($id,'Alarm')['Frame']['FrameId'];
$maxScoreFrame = $this->Frame->findByEventid($id, 'FrameId', array('Score'=>'desc','FrameId'=>'asc'))['Frame'];
$event['Event']['MaxScoreFrameId'] = $maxScoreFrame ? $maxScoreFrame['FrameId'] : null;
$alarmFrame = $this->Frame->findByEventidAndType($id, 'Alarm')['Frame'];
ZM\Debug(print_r($alarmFrame, true));
$event['Event']['AlarmFrameId'] = $alarmFrame ? $alarmFrame['FrameId'] : null;
$this->set(array(
'event' => $event,