fix deleting user with no events causes page to not change
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Jan 3, 2025 at 16:18 UTC
d1cb184e9ed67aeb3e49aba7fb3845987451310a
2 files changed
+30
-18
views/default.handlebars
+15
-9
@@ -3179,9 +3179,11 @@
3179
if (currentNode && (message.event.nodeid == currentNode._id) && (currentDeviceEvents != null)) {
3180
// If this event has a nodeid and we are looking at this node, update the log in real time.
3181
if ((message.event.action == p16filterevents.value) || (p16filterevents.value == "")) {
3182
- currentDeviceEvents.unshift(message.event);
3183
- var eventLimit = parseInt(p16limitdropdown.value);
3184
- while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end
3182
+ if(currentDeviceEvents != null) {
3183
+ currentDeviceEvents.unshift(message.event);
3184
+ var eventLimit = parseInt(p16limitdropdown.value);
3185
+ while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end
3186
+ }
3187
mainUpdate(1024);
3188
}
3189
}
@@ -3189,18 +3191,22 @@
3191
if (currentUser && (message.event.userid == currentUser._id)) {
3192
// If this event has a userid and we are looking at this user, update the log in real time.
3193
if ((message.event.action == p31filterevents.value) || (p31filterevents.value == "")) {
3192
- currentUserEvents.unshift(message.event);
3193
- var eventLimit = parseInt(p31limitdropdown.value);
3194
- while (currentUserEvents.length > eventLimit) { currentUserEvents.pop(); } // Remove element(s) at the end
3194
+ if(currentUserEvents != null) {
3195
+ currentUserEvents.unshift(message.event);
3196
+ var eventLimit = parseInt(p31limitdropdown.value);
3197
+ while (currentUserEvents.length > eventLimit) { currentUserEvents.pop(); } // Remove element(s) at the end
3198
+ }
3199
mainUpdate(2048);
3200
}
3201
}
3202
3203
// Add this event to the main events log.
3204
if ((message.event.action == p3filterevents.value) || (p3filterevents.value == "")) {
3201
- events.unshift(message.event);
3202
- var eventLimit = parseInt(p3limitdropdown.value);
3203
- while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end
3205
+ if(events != null) {
3206
+ events.unshift(message.event);
3207
+ var eventLimit = parseInt(p3limitdropdown.value);
3208
+ while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end
3209
+ }
3210
mainUpdate(32);
3211
}
3212
}
views/default3.handlebars
+15
-9
@@ -3693,9 +3693,11 @@
3693
if (currentNode && (message.event.nodeid == currentNode._id) && (currentDeviceEvents != null)) {
3694
// If this event has a nodeid and we are looking at this node, update the log in real time.
3695
if ((message.event.action == p16filterevents.value) || (p16filterevents.value == "")) {
3696
- currentDeviceEvents.unshift(message.event);
3697
- var eventLimit = parseInt(p16limitdropdown.value);
3698
- while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end
3696
+ if(currentDeviceEvents != null) {
3697
+ currentDeviceEvents.unshift(message.event);
3698
+ var eventLimit = parseInt(p16limitdropdown.value);
3699
+ while (currentDeviceEvents.length > eventLimit) { currentDeviceEvents.pop(); } // Remove element(s) at the end
3700
+ }
3701
mainUpdate(1024);
3702
}
3703
}
@@ -3703,18 +3705,22 @@
3705
if (currentUser && (message.event.userid == currentUser._id)) {
3706
// If this event has a userid and we are looking at this user, update the log in real time.
3707
if ((message.event.action == p31filterevents.value) || (p31filterevents.value == "")) {
3706
- currentUserEvents.unshift(message.event);
3707
- var eventLimit = parseInt(p31limitdropdown.value);
3708
- while (currentUserEvents.length > eventLimit) { currentUserEvents.pop(); } // Remove element(s) at the end
3708
+ if(currentUserEvents != null) {
3709
+ currentUserEvents.unshift(message.event);
3710
+ var eventLimit = parseInt(p31limitdropdown.value);
3711
+ while (currentUserEvents.length > eventLimit) { currentUserEvents.pop(); } // Remove element(s) at the end
3712
+ }
3713
mainUpdate(2048);
3714
}
3715
}
3716
3717
// Add this event to the main events log.
3718
if ((message.event.action == p3filterevents.value) || (p3filterevents.value == "")) {
3715
- events.unshift(message.event);
3716
- var eventLimit = parseInt(p3limitdropdown.value);
3717
- while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end
3719
+ if(events != null) {
3720
+ events.unshift(message.event);
3721
+ var eventLimit = parseInt(p3limitdropdown.value);
3722
+ while (events.length > eventLimit) { events.pop(); } // Remove element(s) at the end
3723
+ }
3724
mainUpdate(32);
3725
}
3726
}