Search kit - fix bugs introduced during refactoring
authorColeman Watts <coleman@civicrm.org>
Wed, 23 Dec 2020 02:24:07 +0000 (21:24 -0500)
committerColeman Watts <coleman@civicrm.org>
Wed, 23 Dec 2020 02:24:07 +0000 (21:24 -0500)
ext/search/ang/crmSearchDisplay.module.js

index d9f5bf2152ac1b5390b11ad53a45981fbfee33e8..f88a7d8f122226f22e9991ba43ab030417ea1a26 100644 (file)
@@ -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);
           }
         });