From ed18f50cd90857d34498638530bec48d4cb2c4c5 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 22 Dec 2020 21:24:07 -0500
Subject: [PATCH] Search kit - fix bugs introduced during refactoring

---
 ext/search/ang/crmSearchDisplay.module.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/search/ang/crmSearchDisplay.module.js b/ext/search/ang/crmSearchDisplay.module.js
index d9f5bf2152..f88a7d8f12 100644
--- a/ext/search/ang/crmSearchDisplay.module.js
+++ b/ext/search/ang/crmSearchDisplay.module.js
@@ -25,7 +25,7 @@
           result = value;
         if (_.isArray(value)) {
           return _.map(value, function(val) {
-            return formatSearchValue(col, val);
+            return formatSearchValue(row, col, val);
           }).join(', ');
         }
         if (value && (type === 'Date' || type === 'Timestamp') && /^\d{4}-\d{2}-\d{2}/.test(value)) {
@@ -79,7 +79,7 @@
         _.each(params.join, function(join) {
           var joinEntity = join[0].split(' AS ')[1],
             idField = joinEntity + '.id';
-          if (!_.includes(params.select, idField) && !searchDisplayUtils.canAggregate('id', joinEntity + '.', params)) {
+          if (!_.includes(params.select, idField) && !canAggregate('id', joinEntity + '.', params)) {
             params.select.push(idField);
           }
         });
-- 
2.25.1