From 6b21bacad21086808b8f6ca46cdb437e6abfd2ea Mon Sep 17 00:00:00 2001 From: si458 Date: Thu, 20 Jun 2024 18:07:50 +0100 Subject: [PATCH] fix new events appearing when filtered #6189 Signed-off-by: si458 --- views/default.handlebars | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/views/default.handlebars b/views/default.handlebars index c42c760d..5dcafdb3 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -3131,10 +3131,12 @@ if (!message.event.nolog) { if (currentNode && (message.event.nodeid == currentNode._id) && (currentDeviceEvents != null)) { // If this event has a nodeid and we are looking at this node, update the log in real time. - currentDeviceEvents.unshift(message.event); - var eventLimit = parseInt(p16limitdropdown.value); - while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end - mainUpdate(1024); + if ((message.event.action == p16filterevents.value) || (p16filterevents.value == "")) { + currentDeviceEvents.unshift(message.event); + var eventLimit = parseInt(p16limitdropdown.value); + while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end + mainUpdate(1024); + } } if (currentUser && (message.event.userid == currentUser._id)) { @@ -3146,10 +3148,12 @@ } // Add this event to the main events log. - events.unshift(message.event); - var eventLimit = parseInt(p3limitdropdown.value); - while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end - mainUpdate(32); + if ((message.event.action == p3filterevents.value) || (p3filterevents.value == "")) { + events.unshift(message.event); + var eventLimit = parseInt(p3limitdropdown.value); + while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end + mainUpdate(32); + } } if (message.event.noact) break; // Take no action on this event