ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into filter_add_copy

This commit is contained in:
Isaac Connor 2019-07-23 13:06:17 -04:00
parent a4a144d2fa 49621bf652
commit d4eae18055
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,12 +133,12 @@ sub Sql {
$$self{Sql} = shift if @_; $$self{Sql} = shift if @_;
if ( ! $$self{Sql} ) { if ( ! $$self{Sql} ) {
$self->{Sql} = ''; $self->{Sql} = '';
if ( ! $self->{Query} ) { if ( ! $self->{Query_json} ) {
Warning("No query in Filter!"); Warning("No query in Filter!");
return; return;
} }
my $filter_expr = ZoneMinder::General::jsonDecode($self->{Query}); my $filter_expr = ZoneMinder::General::jsonDecode($self->{Query_json});
my $sql = 'SELECT E.*, my $sql = 'SELECT E.*,
unix_timestamp(E.StartTime) as Time, unix_timestamp(E.StartTime) as Time,
M.Name as MonitorName, M.Name as MonitorName,