From 312dab2c2050101fc02be886bc750a3e1aeafc1b Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Sat, 20 Apr 2019 17:14:43 +0200 Subject: [PATCH 1/2] Fixing video export view --- web/skins/classic/views/video.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/video.php b/web/skins/classic/views/video.php index aab9278d6..ca4c46f4b 100644 --- a/web/skins/classic/views/video.php +++ b/web/skins/classic/views/video.php @@ -46,7 +46,7 @@ if ( isset($_REQUEST['scale']) ) else $scale = reScale(SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE); -$Event = new Event($event['Id']); +$Event = new ZM\Event($event['Id']); $eventPath = $Event->Path(); $videoFormats = array(); From 8b375de455e576b0c50f294dc29422409634507a Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Wed, 15 Jan 2020 20:31:05 +0100 Subject: [PATCH 2/2] Avoid duplicate Monitors in API --- web/api/app/Controller/MonitorsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php index 789307795..92114a558 100644 --- a/web/api/app/Controller/MonitorsController.php +++ b/web/api/app/Controller/MonitorsController.php @@ -61,7 +61,8 @@ class MonitorsController extends AppController { 'Groups_Monitors.MonitorId = Monitor.Id', ), ), - ) + ), + 'group' => '`Monitor`.`Id`', ); $monitors = $this->Monitor->find('all',$find_array); $this->set(array(