diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2013-10-22 08:44:25 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2013-10-22 09:57:54 +0400 |
| commit | 66add89b764c709869c1b4976a4a447a4e61be4c (patch) | |
| tree | c6b33350775bdda2ec2ce16953bb92dad68c80c9 /plugins | |
| parent | a10eb83bfc85221b0afaedccfae881a55639d782 (diff) | |
Refs #4200, change function of AddSummaryRow and move logic to Truncate filter.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreVisualizations/JqplotDataGenerator.php | 2 | ||||
| -rw-r--r-- | plugins/DBStats/DBStats.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php index f13a6cf3cc..00e4330bd3 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator.php @@ -87,7 +87,7 @@ class JqplotDataGenerator // if addTotalRow was called in GenerateGraphHTML, add a row containing totals of // different metrics if ($this->properties['add_total_row']) { - $dataTable->queueFilter('AddSummaryRow', array(0, Piwik::translate('General_Total'), null, false)); + $dataTable->queueFilter('AddSummaryRow', Piwik::translate('General_Total')); } $dataTable->applyQueuedFilters(); diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php index 63f9f439f5..9b9eac305c 100644 --- a/plugins/DBStats/DBStats.php +++ b/plugins/DBStats/DBStats.php @@ -16,6 +16,7 @@ use Piwik\Date; use Piwik\Menu\MenuAdmin; use Piwik\Option; use Piwik\Piwik; +use Piwik\DataTable\Row\DataTableSummaryRow; use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Pie; @@ -312,8 +313,7 @@ class DBStats extends \Piwik\Plugin if ($view->isViewDataTableId(HtmlTable::ID)) { // add summary row only if displaying a table - $view->config->filters[] = array( - 'AddSummaryRow', array(0, Piwik::translate('General_Total'), 'label', false), $isPriority = true); + $dataTable->queueFilter('AddSummaryRow', Piwik::translate('General_Total')); // add percentage column if desired if ($addPercentColumn |