diff options
| author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-03-20 07:03:13 +0300 |
|---|---|---|
| committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-03-20 07:03:13 +0300 |
| commit | 3aa1a00ffac6cf263abdf5998e33b2183dc8c7f1 (patch) | |
| tree | 969d4b4af9b5aeb66a372f9d1a5412e3751b0a39 /plugins/UserCountry | |
| parent | eb55d2b3c5c0b067339425bfea0e15518e14bc2e (diff) | |
- fix #14 Searching on countries within the DataTable is not working properly
- if Piwik_GetWidgetList is called several times, hook is only fired once
- search in datatable is now case insensitive
Diffstat (limited to 'plugins/UserCountry')
| -rw-r--r-- | plugins/UserCountry/API.php | 6 | ||||
| -rw-r--r-- | plugins/UserCountry/Controller.php | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 6c6f00c857..f0722307e5 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -33,9 +33,9 @@ class Piwik_UserCountry_API Piwik::checkUserHasViewAccess( $idSite ); $archive = Piwik_Archive::build($idSite, $period, $date ); $dataTable = $archive->getDataTable('UserCountry_country'); - $dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;'))); - $dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getFlagFromCode')); - $dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_CountryTranslate')); + $filter = new Piwik_DataTable_Filter_ColumnCallbackAddMetadata($dataTable, 'label', 'code', create_function('$label', 'return $label;')); + $filter = new Piwik_DataTable_Filter_ColumnCallbackAddMetadata($dataTable, 'label', 'logo', 'Piwik_getFlagFromCode'); + $filter = new Piwik_DataTable_Filter_ColumnCallbackReplace($dataTable, 'label', 'Piwik_CountryTranslate'); $dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames'); $dataTable->queueFilter('Piwik_DataTable_Filter_AddConstantMetadata', array('logoWidth', 18)); $dataTable->queueFilter('Piwik_DataTable_Filter_AddConstantMetadata', array('logoHeight', 12)); diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index a2395620f8..bd859cdeb5 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -24,7 +24,6 @@ class Piwik_UserCountry_Controller extends Piwik_Controller $view->setColumnsToDisplay( array('label','nb_uniq_visitors') ); $view->setSortedColumn( 1 ); - $view->disableSearchBox(); $view->setLimit( 5 ); $view->enableShowGoals(); |