fixes #3892 Fixing + testing filter_truncate on getPlugin

matomo-org · Apr 14, 2013 · 7853d2d · 7853d2d
1 parent 1c41d3c
commit 7853d2d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
@@ -492,6 +492,9 @@ public function sumRow(Piwik_DataTable_Row $rowToSum, $enableCopyMetadata = true
     private function getColumnValuesMerged($operation, $thisColumnValue, $columnToSumValue)
     {
         switch ($operation) {
+            case 'skip':
+                $newValue = null;
+                break;
             case 'max':
                 $newValue = max($thisColumnValue, $columnToSumValue);
                 break;

diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
@@ -215,6 +215,11 @@ public function getPlugin($idSite, $period, $date, $segment = false)
 
             $visitsSum = $visitsSumTotal - $ieVisits;
 
+
+            // When Truncate filter is applied, it will call AddSummaryRow which tries to sum all rows.
+            // We tell the object to skip the column nb_visits_percentage when aggregating (since it's not correct to sum % values)
+            $table->setColumnAggregationOperation('nb_visits_percentage', 'skip');
+
             // The filter must be applied now so that the new column can
             // be sorted by the generic filters (applied right after this loop exits)
             $table->filter('ColumnCallbackAddColumnPercentage', array('nb_visits_percentage', Piwik_Archive::INDEX_NB_VISITS, $visitsSum, 1));

diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
@@ -16,6 +16,9 @@
 
 function Piwik_getPluginsLogo($oldLabel)
 {
+    if($oldLabel == Piwik_Translate('General_Others')) {
+        return false;
+    }
     return 'plugins/UserSettings/images/plugins/' . $oldLabel . '.gif';
 }
 

diff --git a/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php b/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php
@@ -24,7 +24,12 @@ public function testApi($api, $params)
 
     public function getApiForTesting()
     {
-        $apiToCall = array('Referers.getKeywords', 'Actions.getPageUrls');
+        $apiToCall = array(
+            'Referers.getKeywords',
+            'Actions.getPageUrls',
+
+            // Specifically testing getPlugin filter_truncate works
+            'UserSettings.getPlugin');
 
         return array(
             array($apiToCall, array('idSite'                 => self::$fixture->idSite,