Skip to content
Extraits de code Groupes Projets
Valider ccf13b8c rédigé par mattab's avatar mattab
Parcourir les fichiers

Small refactor refs #4706

parent b0b6338d
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
core/API/DataTableGenericFilter.php
+ 44
− 34
Voir le fichier @ ccf13b8c
...@@ -10,8 +10,8 @@ namespace Piwik\API; ...@@ -10,8 +10,8 @@ namespace Piwik\API;
use Exception; use Exception;
use Piwik\Common; use Piwik\Common;
use Piwik\DataTable;
use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal; use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
use Piwik\DataTable;
class DataTableGenericFilter class DataTableGenericFilter
{ {
...@@ -53,37 +53,45 @@ class DataTableGenericFilter ...@@ -53,37 +53,45 @@ class DataTableGenericFilter
{ {
if (is_null(self::$genericFiltersInfo)) { if (is_null(self::$genericFiltersInfo)) {
self::$genericFiltersInfo = array( self::$genericFiltersInfo = array(
'Pattern' => array( array('Pattern',
'filter_column' => array('string', 'label'), array(
'filter_pattern' => array('string'), 'filter_column' => array('string', 'label'),
), 'filter_pattern' => array('string')
'PatternRecursive' => array( )),
'filter_column_recursive' => array('string', 'label'), array('PatternRecursive',
'filter_pattern_recursive' => array('string'), array(
), 'filter_column_recursive' => array('string', 'label'),
'ExcludeLowPopulation' => array( 'filter_pattern_recursive' => array('string'),
'filter_excludelowpop' => array('string'), )),
'filter_excludelowpop_value' => array('float', '0'), array('ExcludeLowPopulation',
), array(
'AddColumnsProcessedMetrics' => array( 'filter_excludelowpop' => array('string'),
'filter_add_columns_when_show_all_columns' => array('integer') 'filter_excludelowpop_value' => array('float', '0'),
), )),
'AddColumnsProcessedMetricsGoal' => array( array('AddColumnsProcessedMetrics',
'filter_update_columns_when_show_all_goals' => array('integer'), array(
'idGoal' => array('string', AddColumnsProcessedMetricsGoal::GOALS_OVERVIEW), 'filter_add_columns_when_show_all_columns' => array('integer')
), )),
'Sort' => array( array('AddColumnsProcessedMetricsGoal',
'filter_sort_column' => array('string'), array(
'filter_sort_order' => array('string', 'desc'), 'filter_update_columns_when_show_all_goals' => array('integer'),
), 'idGoal' => array('string', AddColumnsProcessedMetricsGoal::GOALS_OVERVIEW),
'Truncate' => array( )),
'filter_truncate' => array('integer'), array('Sort',
), array(
'Limit' => array( 'filter_sort_column' => array('string'),
'filter_offset' => array('integer', '0'), 'filter_sort_order' => array('string', 'desc'),
'filter_limit' => array('integer'), )),
'keep_summary_row' => array('integer', '0'), array('Truncate',
), array(
'filter_truncate' => array('integer'),
)),
array('Limit',
array(
'filter_offset' => array('integer', '0'),
'filter_limit' => array('integer'),
'keep_summary_row' => array('integer', '0'),
)),
); );
} }
...@@ -110,10 +118,12 @@ class DataTableGenericFilter ...@@ -110,10 +118,12 @@ class DataTableGenericFilter
$genericFilters = self::getGenericFiltersInformation(); $genericFilters = self::getGenericFiltersInformation();
$filterApplied = false; $filterApplied = false;
foreach ($genericFilters as $filterName => $parameters) { foreach ($genericFilters as $filterMeta) {
$filterName = $filterMeta[0];
$filterParams = $filterMeta[1];
$filterParameters = array(); $filterParameters = array();
$exceptionRaised = false; $exceptionRaised = false;
foreach ($parameters as $name => $info) { foreach ($filterParams as $name => $info) {
// parameter type to cast to // parameter type to cast to
$type = $info[0]; $type = $info[0];
......
core/API/Request.php
+ 1
− 1
Voir le fichier @ ccf13b8c
...@@ -343,7 +343,7 @@ class Request ...@@ -343,7 +343,7 @@ class Request
// unless the filter param was in $queryParams // unless the filter param was in $queryParams
$genericFiltersInfo = DataTableGenericFilter::getGenericFiltersInformation(); $genericFiltersInfo = DataTableGenericFilter::getGenericFiltersInformation();
foreach ($genericFiltersInfo as $filter) { foreach ($genericFiltersInfo as $filter) {
foreach ($filter as $queryParamName => $queryParamInfo) { foreach ($filter[1] as $queryParamName => $queryParamInfo) {
if (!isset($params[$queryParamName])) { if (!isset($params[$queryParamName])) {
$params[$queryParamName] = null; $params[$queryParamName] = null;
} }
......
0% 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