ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make all Filters operate on in-progress events

pull/2964/head
Isaac Connor 2020-06-05 18:01:20 -04:00
parent f71926c736
commit d0a24ae32b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
View File

@ -324,14 +324,9 @@ sub Sql {
} # end if terms
if ( $self->{Sql} ) {
if ( $self->{AutoMessage} ) {
# Include all events, including events that are still ongoing
# and have no EndTime yet
$sql .= ' WHERE ( '.$self->{Sql}.' )';
} else {
# Only include closed events (events with valid EndTime)
$sql .= ' WHERE (E.EndTime IS NOT NULL) AND ( '.$self->{Sql}.' )';
}
$sql .= ' WHERE ( '.$self->{Sql}.' )';
}
my @auto_terms;
if ( $self->{AutoArchive} ) {