diff options
| author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-04-07 02:12:25 +0400 |
|---|---|---|
| committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-04-07 02:12:25 +0400 |
| commit | 6139e8532368af2e6b3d3e1ada9f54ca4cdee487 (patch) | |
| tree | 4d5cfee4fafab88557a7c096c4d5559abe21721d /plugins/UserCountry | |
| parent | 3216a7d0e47200859d573d1a0f668fab194f67d9 (diff) | |
Filters are now applied by
$table->filter('Limit', array(2,2));
rather than
$table->filter('Piwik_DataTable_Filter_Limit', array(2,2));
old way still works though
Diffstat (limited to 'plugins/UserCountry')
| -rw-r--r-- | plugins/UserCountry/API.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 535e5979d4..976f649344 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -32,19 +32,19 @@ class Piwik_UserCountry_API { $dataTable = $this->getDataTable('UserCountry_country', $idSite, $period, $date); // apply filter on the whole datatable in order the inline search to work (searches are done on "beautiful" label) - $dataTable->filter('Piwik_DataTable_Filter_ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;'))); - $dataTable->filter('Piwik_DataTable_Filter_ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getFlagFromCode')); - $dataTable->filter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_CountryTranslate')); - $dataTable->queueFilter('Piwik_DataTable_Filter_AddConstantMetadata', array('logoWidth', 18)); - $dataTable->queueFilter('Piwik_DataTable_Filter_AddConstantMetadata', array('logoHeight', 12)); + $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;'))); + $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getFlagFromCode')); + $dataTable->filter('ColumnCallbackReplace', array('label', 'Piwik_CountryTranslate')); + $dataTable->queuefilter('AddConstantMetadata', array('logoWidth', 18)); + $dataTable->queuefilter('AddConstantMetadata', array('logoHeight', 12)); return $dataTable; } public function getContinent( $idSite, $period, $date ) { $dataTable = $this->getDataTable('UserCountry_continent', $idSite, $period, $date); - $dataTable->filter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_ContinentTranslate')); - $dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;'))); + $dataTable->filter('ColumnCallbackReplace', array('label', 'Piwik_ContinentTranslate')); + $dataTable->queuefilter('ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;'))); return $dataTable; } @@ -53,8 +53,8 @@ class Piwik_UserCountry_API Piwik::checkUserHasViewAccess( $idSite ); $archive = Piwik_Archive::build($idSite, $period, $date ); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Piwik_DataTable_Filter_Sort', array(Piwik_Archive::INDEX_NB_VISITS)); - $dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames'); + $dataTable->filter('Sort', array(Piwik_Archive::INDEX_NB_VISITS)); + $dataTable->queuefilter('ReplaceColumnNames'); return $dataTable; } |