mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2024-09-11 08:55:32 +03:00
fix new events appearing when filtered #6189
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
parent
46ebadf440
commit
6b21bacad2
@ -3131,10 +3131,12 @@
|
|||||||
if (!message.event.nolog) {
|
if (!message.event.nolog) {
|
||||||
if (currentNode && (message.event.nodeid == currentNode._id) && (currentDeviceEvents != null)) {
|
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.
|
// If this event has a nodeid and we are looking at this node, update the log in real time.
|
||||||
currentDeviceEvents.unshift(message.event);
|
if ((message.event.action == p16filterevents.value) || (p16filterevents.value == "")) {
|
||||||
var eventLimit = parseInt(p16limitdropdown.value);
|
currentDeviceEvents.unshift(message.event);
|
||||||
while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end
|
var eventLimit = parseInt(p16limitdropdown.value);
|
||||||
mainUpdate(1024);
|
while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end
|
||||||
|
mainUpdate(1024);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentUser && (message.event.userid == currentUser._id)) {
|
if (currentUser && (message.event.userid == currentUser._id)) {
|
||||||
@ -3146,10 +3148,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add this event to the main events log.
|
// Add this event to the main events log.
|
||||||
events.unshift(message.event);
|
if ((message.event.action == p3filterevents.value) || (p3filterevents.value == "")) {
|
||||||
var eventLimit = parseInt(p3limitdropdown.value);
|
events.unshift(message.event);
|
||||||
while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end
|
var eventLimit = parseInt(p3limitdropdown.value);
|
||||||
mainUpdate(32);
|
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
|
if (message.event.noact) break; // Take no action on this event
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user