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

Author: connortechnology

web/skins/classic/views/_monitor_filters.php

@@ -290,8 +290,9 @@ function buildMonitorsFilters() {
   return [
     "filterBar" => $html,
     "displayMonitors" => $displayMonitors,
-    "storage_areas" => $storage_areas,
-    "StorageById" => $StorageById,
+    "storage_areas" => $storage_areas, //Console page
+    "StorageById" => $StorageById, //Console page
+    "colAllAvailableMonitors" => $colAllAvailableMonitors, //Console page
     "selected_monitor_ids" => $selected_monitor_ids
   ];
 }

web/skins/classic/views/console.php

@@ -103,6 +103,7 @@
 $displayMonitors = $resultMonitorFilters['displayMonitors'];
 $storage_areas = $resultMonitorFilters['storage_areas'];
 $StorageById = $resultMonitorFilters['StorageById'];
+$colAllAvailableMonitors = $resultMonitorFilters['selected_monitor_ids'];
 
 $displayMonitorIds = array_map(function($m){return $m['Id'];}, $displayMonitors);