From 92d3e00db18417e3e62d1890e0cf88774b8dfd05 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Sep 2023 13:35:51 -0400
Subject: [PATCH] Add GROUP BY E.Id to fix mysql complaining about teh
 aggregate function

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 6385e190c..f36c0ba88 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -148,9 +148,15 @@ sub Sql {
         E.*, 
         unix_timestamp(E.StartDateTime) 
           AS Time,
-        CONCAT_WS(", ", (SELECT Name FROM Tags WHERE Id IN (SELECT TagId FROM Events_Tags WHERE EventId=E.Id))) 
+        GROUP_CONCAT(T.Name SEPARATOR ", ") 
       FROM Events 
         AS E 
+      LEFT JOIN Events_Tags 
+        AS ET 
+        ON E.Id = ET.EventId 
+      LEFT JOIN Tags 
+        AS T 
+        ON T.Id = ET.TagId 
     ';
 
     if ( $filter_expr->{terms} ) {
@@ -410,6 +416,7 @@ sub Sql {
     } elsif ( $filter_expr->{sort_field} ne '' ) {
       $sort_column = 'E.'.$filter_expr->{sort_field};
     }
+    $sql .= ' GROUP BY E.Id ';
     if ( $sort_column ne '' ) {
       $sql .= ' ORDER BY '.$sort_column.' '.($filter_expr->{sort_asc} ? 'ASC' : 'DESC');
     }