Ignore aggregated rows for totals

matomo-org · Jan 13, 2025 · 19e6c7b · 19e6c7b
1 parent e6bac25
commit 19e6c7b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/API/DataTableManipulator/ReportTotalsCalculator.php b/core/API/DataTableManipulator/ReportTotalsCalculator.php
@@ -107,6 +107,10 @@ protected function manipulateDataTable($dataTable)
         /** @var DataTable\Row $totalRow */
         $totalRow = null;
         foreach ($firstLevelTable->getRows() as $row) {
+            if ($row->getMetadata('is_aggregate') == '1') {
+                continue; // skip aggregated row added by flattening
+            }
+
             if (!isset($totalRow)) {
                 $columns = $row->getColumns();
                 $columns['label'] = DataTable::LABEL_TOTALS_ROW;

diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
@@ -400,6 +400,7 @@ public function getProcessedReport(
                                                        'serialize'  => '0',
                                                        'language'   => $language,
                                                        'idSubtable' => $idSubtable,
+                                                       'keep_totals_row' => 1,
                                                   ));
 
         if (!empty($segment)) {
@@ -778,7 +779,7 @@ private function handleSimpleDataTable($idSite, $simpleDataTable, $metadataColum
 
     private function aggregateReportTotalValues($simpleDataTable, $metadateColumns, $totals)
     {
-        $metadataTotals = $simpleDataTable->getMetadata('totals');
+        $metadataTotals = $simpleDataTable->getTotalsRow();
 
         if (empty($metadataTotals)) {
             return $totals;