Skip to content
Extraits de code Groupes Projets
Valider 9affe254 rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Refs #6756, fix regression in last commit.

parent 61f0e6a6
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -86,6 +86,7 @@ class JqplotDataGenerator ...@@ -86,6 +86,7 @@ class JqplotDataGenerator
$dataTable->queueFilter('AddSummaryRow', Piwik::translate('General_Total')); $dataTable->queueFilter('AddSummaryRow', Piwik::translate('General_Total'));
} }
$dataTable->applyQueuedFilters();
$this->initChartObjectData($dataTable, $visualization); $this->initChartObjectData($dataTable, $visualization);
} }
......
...@@ -71,9 +71,11 @@ abstract class BaseEcommerceItem extends BaseEcommerce ...@@ -71,9 +71,11 @@ abstract class BaseEcommerceItem extends BaseEcommerce
$view->config->show_exclude_low_population = false; $view->config->show_exclude_low_population = false;
$view->config->show_table_all_columns = false; $view->config->show_table_all_columns = false;
$moneyColumns = array('revenue'); if (!($view instanceof Evolution)) {
$formatter = array(new Formatter(), 'getPrettyMoney'); $moneyColumns = array('revenue');
$view->config->filters[] = array('ColumnCallbackReplace', array($moneyColumns, $formatter, array($idSite))); $formatter = array(new Formatter(), 'getPrettyMoney');
$view->config->filters[] = array('ColumnCallbackReplace', array($moneyColumns, $formatter, array($idSite)));
}
$view->requestConfig->filter_limit = 10; $view->requestConfig->filter_limit = 10;
$view->requestConfig->filter_sort_column = 'revenue'; $view->requestConfig->filter_sort_column = 'revenue';
......
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