Merge pull request #4092 from IgorA100/patch-156

Fix: Recovering the Lost $storage_areas, $StorageById & $selected_monitor_ids Variable ( _monitor_filters.php, console.php, montagereview.php, report_event_audit.php)
ZoneMinder · Jul 16, 2024 · 75ecf1f · 75ecf1f
2 parents 9c81da4 + 5cc545e
commit 75ecf1f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/web/skins/classic/views/_monitor_filters.php b/web/skins/classic/views/_monitor_filters.php
@@ -290,6 +290,9 @@ function buildMonitorsFilters() {
  return [
  "filterBar" => $html,
  "displayMonitors" => $displayMonitors,
+ "storage_areas" => $storage_areas,
+ "StorageById" => $StorageById,
+ "selected_monitor_ids" => $selected_monitor_ids
  ];
 }
 ?>
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
@@ -101,6 +101,8 @@
 $resultMonitorFilters = buildMonitorsFilters();
 $filterbar = $resultMonitorFilters['filterBar'];
 $displayMonitors = $resultMonitorFilters['displayMonitors'];
+$storage_areas = $resultMonitorFilters['storage_areas'];
+$StorageById = $resultMonitorFilters['StorageById'];
 
 $displayMonitorIds = array_map(function($m){return $m['Id'];}, $displayMonitors);
 

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
@@ -61,6 +61,7 @@
 $resultMonitorFilters = buildMonitorsFilters();
 $filterbar = $resultMonitorFilters['filterBar'];
 $displayMonitors = $resultMonitorFilters['displayMonitors'];
+$selected_monitor_ids = $resultMonitorFilters['selected_monitor_ids'];
 
 $preference = ZM\User_Preference::find_one([
  'UserId'=>$user->Id(),

diff --git a/web/skins/classic/views/report_event_audit.php b/web/skins/classic/views/report_event_audit.php
@@ -23,6 +23,7 @@
 $resultMonitorFilters = buildMonitorsFilters();
 $filterbar = $resultMonitorFilters['filterBar'];
 $displayMonitors = $resultMonitorFilters['displayMonitors'];
+$selected_monitor_ids = $resultMonitorFilters['selected_monitor_ids'];
 
 if ( isset($_REQUEST['minTime']) ) {
  $minTime = validHtmlStr($_REQUEST['minTime']);