fix(grouping): respect customTreeAggregationFn on grouped columns (#6868

) Fixes #6402
angular-ui · Oct 16, 2018 · e2a7310 · e2a7310
1 parent 24d4224
commit e2a7310
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/features/grouping/js/grouping.js b/src/features/grouping/js/grouping.js
@@ -684,7 +684,13 @@
         }
 
         column.treeAggregation = { type: uiGridGroupingConstants.aggregation.COUNT, source: 'grouping' };
-        column.treeAggregationFn = uiGridTreeBaseService.nativeAggregations()[uiGridGroupingConstants.aggregation.COUNT].aggregationFn;
+
+        if ( typeof(column.colDef.customTreeAggregationFn) !== 'undefined' ) {
+          column.treeAggregationFn = column.colDef.customTreeAggregationFn;
+        } else {
+          column.treeAggregationFn = uiGridTreeBaseService.nativeAggregations()[uiGridGroupingConstants.aggregation.COUNT].aggregationFn;
+        }
+
         column.treeAggregationFinalizerFn = service.groupedFinalizerFn;
 
         grid.api.grouping.raise.groupingChanged(column);