Skip to content
Extraits de code Groupes Projets
Valider 3d2123d1 rédigé par mattpiwik's avatar mattpiwik
Parcourir les fichiers

Refs #3332 Summing rows now keep the latest metadata to ensure the latest...

Refs #3332 Summing rows now keep the latest metadata to ensure the latest format of URLs is used when summing over large date range

git-svn-id: http://dev.piwik.org/svn/trunk@7103 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent dd3d99a5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -492,6 +492,7 @@ class Piwik_DataTable_Row ...@@ -492,6 +492,7 @@ class Piwik_DataTable_Row
$this->setColumn( $columnToSumName, $newValue); $this->setColumn( $columnToSumName, $newValue);
} }
} }
$this->c[self::METADATA] = $rowToSum->c[self::METADATA];
} }
/** /**
......
...@@ -278,7 +278,9 @@ class DataTableTest extends PHPUnit_Framework_TestCase ...@@ -278,7 +278,9 @@ class DataTableTest extends PHPUnit_Framework_TestCase
'integerArrayToSum' => array( 1 => 6, 2 => 15.5, 3 => array(1 => 2, 2 => 7)), 'integerArrayToSum' => array( 1 => 6, 2 => 15.5, 3 => array(1 => 2, 2 => 7)),
0925824 => 'toto', 0925824 => 'toto',
); );
$rowWanted = new Piwik_DataTable_Row( array(Piwik_DataTable_Row::COLUMNS => $columnsWanted));
// Also testing that metadata is copied over
$rowWanted = new Piwik_DataTable_Row( array(Piwik_DataTable_Row::COLUMNS => $columnsWanted,Piwik_DataTable_Row::METADATA => $metadata));
$this->assertTrue( Piwik_DataTable_Row::isEqual($rowWanted, $finalRow)); $this->assertTrue( Piwik_DataTable_Row::isEqual($rowWanted, $finalRow));
} }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter