From c4eb59442e4767d53b8b052add1a1d5d511ae46e Mon Sep 17 00:00:00 2001 From: Esteban Flores Date: Mon, 2 Nov 2020 01:05:57 -0600 Subject: [PATCH 1/2] Changed "Purge By Age" filter Changed "Purge By Age" filter, the "date" option is not available in v1.34.22. Using "End Date" as the filter parameter works just fine. --- docs/faq.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 56b67d082..1db30e05f 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -27,7 +27,7 @@ After you've done that, you changes will automatically be loaded into zmfilter w Check the ``zmfilter.log`` file to make sure it is running as sometimes missing perl modules mean that it never runs but people don't always realize. **Purge By Age** -To delete events that are older than 7 days, create a new filter with "Date" set to "less than" and a value of "-7 days", sort by "date/time" in "asc"ending order, then enable the checkbox "delete all matches". You can also use a value of week or week and days: "-2 week" or "-2 week 4 day" +To delete events that are older than 7 days, create a new filter with "End Date" set to "less than" and a value of "-7 days", sort by "date/time" in "asc"ending order, then enable the checkbox "delete all matches". You can also use a value of week or week and days: "-2 week" or "-2 week 4 day" Save with 'Run Filter In Background' enabled to have it run automatically. Optional skip archived events: click on the plus sign next to -7 days to add another condition. "and" "archive status" equal to "unarchived only". @@ -534,4 +534,4 @@ The GPL license allows you produce systems based on GPL software provided your s I am having issues with zmNinja and/or Event Notification Server ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -zmNinja and the Event Notification Server are 3rd party solutions. The developer maintains exhaustive `documentation and FAQs `__. Please direct your questions there. \ No newline at end of file +zmNinja and the Event Notification Server are 3rd party solutions. The developer maintains exhaustive `documentation and FAQs `__. Please direct your questions there. From 746882ba85fe8a5b0c763a20a06d86659f6dd697 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 5 Nov 2020 13:45:02 -0500 Subject: [PATCH 2/2] Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070 --- web/skins/classic/views/event.php | 3 --- web/skins/classic/views/js/event.js | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php index b9c2d8f38..231a60430 100644 --- a/web/skins/classic/views/event.php +++ b/web/skins/classic/views/event.php @@ -46,9 +46,6 @@ if ( isset($_REQUEST['rate']) ) { if ( isset($_REQUEST['scale']) ) { $scale = validInt($_REQUEST['scale']); -} else if ( isset($_COOKIE['zmEventScaleAuto']) ) { - // If we're using scale to fit use it on all monitors - $scale = '0'; } else if ( isset($_COOKIE['zmEventScale'.$Event->MonitorId()]) ) { $scale = $_COOKIE['zmEventScale'.$Event->MonitorId()]; } else { diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index efc9360da..ef79125f0 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -175,12 +175,7 @@ function changeScale() { } else { alarmCue.html(renderAlarmCues(eventViewer));//just re-render alarmCues. skip ajax call } - if ( scale = '0' || scale == 'auto' ) { - Cookie.write('zmEventScaleAuto', 'auto', {duration: 10*365}); - } else { - Cookie.write('zmEventScale'+eventData.MonitorId, scale, {duration: 10*365}); - Cookie.dispose('zmEventScaleAuto'); - } + Cookie.write('zmEventScale'+eventData.MonitorId, scale, {duration: 10*365}); } function changeReplayMode() {