fix new events appearing when filtered #6189
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Jun 20, 2024 at 18:07 UTC
6b21bacad21086808b8f6ca46cdb437e6abfd2ea
1 file changed
+12
-8
views/default.handlebars
+12
-8
@@ -3131,10 +3131,12 @@
3131
if (!message.event.nolog) {
3132
if (currentNode && (message.event.nodeid == currentNode._id) && (currentDeviceEvents != null)) {
3133
// If this event has a nodeid and we are looking at this node, update the log in real time.
3134
- currentDeviceEvents.unshift(message.event);
3135
- var eventLimit = parseInt(p16limitdropdown.value);
3136
- while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end
3137
- mainUpdate(1024);
3134
+ if ((message.event.action == p16filterevents.value) || (p16filterevents.value == "")) {
3135
+ currentDeviceEvents.unshift(message.event);
3136
+ var eventLimit = parseInt(p16limitdropdown.value);
3137
+ while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end
3138
+ mainUpdate(1024);
3139
+ }
3140
}
3141
3142
if (currentUser && (message.event.userid == currentUser._id)) {
@@ -3146,10 +3148,12 @@
3148
}
3149
3150
// Add this event to the main events log.
3149
- events.unshift(message.event);
3150
- var eventLimit = parseInt(p3limitdropdown.value);
3151
- while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end
3152
- mainUpdate(32);
3151
+ if ((message.event.action == p3filterevents.value) || (p3filterevents.value == "")) {
3152
+ events.unshift(message.event);
3153
+ var eventLimit = parseInt(p3limitdropdown.value);
3154
+ while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end
3155
+ mainUpdate(32);
3156
+ }
3157
}
3158
if (message.event.noact) break; // Take no action on this event
3159