mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2025-12-23 22:37:53 -05:00
Merge branch 'master' of github.com:ZoneMinder/zoneminder
This commit is contained in:
@@ -165,7 +165,7 @@ sub Sql {
|
||||
if ( $term->{attr} eq 'AlarmedZoneId' ) {
|
||||
$term->{op} = 'EXISTS';
|
||||
} elsif ( $term->{attr} eq 'Tags' ) {
|
||||
$fields .= ', (SELECT Name FROM Tags WHERE Id IN (SELECT TagId FROM Events_Tags WHERE Events_Tags.EventId=E.Id)) As Tags';
|
||||
$fields .= ', (SELECT GROUP_CONCAT(Name) FROM Tags WHERE Id IN (SELECT TagId FROM Events_Tags WHERE Events_Tags.EventId=E.Id)) As Tags';
|
||||
$self->{Sql} .= 'T.Id';
|
||||
$from .= ' LEFT JOIN Events_Tags AS ET ON E.Id = ET.EventId LEFT JOIN Tags AS T ON T.Id = ET.TagId';
|
||||
} elsif ( $term->{attr} =~ /^Monitor/ ) {
|
||||
|
||||
Reference in New Issue
Block a user