From 697f8de4f6d561781c992ca97e87b2cada0b71d3 Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Sun, 24 Mar 2024 19:51:24 +0300
Subject: [PATCH 1/2] Fix: Add "All Events" in array "translate" (View event)

---
 web/skins/classic/views/js/event.js.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index 8f5cf0650..34640d744 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -112,4 +112,5 @@ var translate = {
   "Exit Fullscreen": "<?php echo translate('Exit Fullscreen') ?>",
   "Live": "<?php echo translate('Live') ?>",
   "Edit": "<?php echo translate('Edit') ?>",
+  "All Events": "<?php echo translate('All Events') ?>",
 };

From 4417e24ee7f07e853b3523c77ec0d6b0ee0f1c0a Mon Sep 17 00:00:00 2001
From: IgorA100 <igora100@gmail.com>
Date: Mon, 25 Mar 2024 13:12:21 +0300
Subject: [PATCH 2/2] Feat: Changed monitor filter (in header table) to go from
 console to list of events

Changes are made to transition links to list of events from table header.

If no monitor is selected in console, you should not pass all monitors to filter; you must leave the monitor filter empty.
---
 web/skins/classic/views/console.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 8410f6fb7..a239fadcb 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -252,16 +252,18 @@ ob_start();
 <?php }
 
   foreach ( array_keys($eventCounts) as $i ) {
-    $filter = addFilterTerm(
-      $eventCounts[$i]['filter'],
-      count($eventCounts[$i]['filter']['Query']['terms']),
-      array(
-        'cnj'=>'and',
-        'attr'=>'Monitor',
-        'op'=>'IN',
-        'val'=>implode(',', $displayMonitorIds)
-        )
-    );
+      $filter = addFilterTerm(
+        $eventCounts[$i]['filter'],
+        count($eventCounts[$i]['filter']['Query']['terms']),
+        gettype ($_SESSION['MonitorId']) == "array" #Add monitors to the filter only if they are selected in select
+          ? array(
+            'cnj'=>'and',
+            'attr'=>'Monitor',
+            'op'=>'IN',
+            'val'=>implode(',', $displayMonitorIds)
+            )
+          : false
+      );
     parseFilter($filter);
     echo '<th class="colEvents"><a '
       .(canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$filter['querystring'].'">' : '')