diff options
author | Matthieu Aubry <matt@piwik.org> | 2015-03-17 06:26:20 +0300 |
---|---|---|
committer | Matthieu Aubry <matt@piwik.org> | 2015-03-17 06:26:20 +0300 |
commit | f1894a1aee763f840a6d541aec6db9ca2c05337e (patch) | |
tree | 22247e12b1413df298f6b804311abe9678d41daa /plugins | |
parent | f3d61fc73967d06ac0bfb9d4aa998c89db2a8191 (diff) | |
parent | b7f3f7bd6d6d12a505b50d2740c47007d2d82985 (diff) |
Merge pull request #7452 from piwik/7388
Fix Sort filters are sometimes applied multiple times
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/DevicePlugins/API.php | 1 | ||||
-rw-r--r-- | plugins/DevicePlugins/Reports/Base.php | 2 | ||||
-rw-r--r-- | plugins/DevicesDetection/API.php | 1 | ||||
-rw-r--r-- | plugins/DevicesDetection/Reports/Base.php | 4 | ||||
-rw-r--r-- | plugins/Resolution/API.php | 1 | ||||
-rw-r--r-- | plugins/Resolution/Reports/Base.php | 2 | ||||
-rw-r--r-- | plugins/UserCountry/API.php | 1 | ||||
-rw-r--r-- | plugins/UserCountry/Reports/Base.php | 2 |
8 files changed, 10 insertions, 4 deletions
diff --git a/plugins/DevicePlugins/API.php b/plugins/DevicePlugins/API.php index c49839e8ae..21765a981d 100644 --- a/plugins/DevicePlugins/API.php +++ b/plugins/DevicePlugins/API.php @@ -32,7 +32,6 @@ class API extends \Piwik\Plugin\API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); return $dataTable; diff --git a/plugins/DevicePlugins/Reports/Base.php b/plugins/DevicePlugins/Reports/Base.php index 81116f4d1d..06eebe686c 100644 --- a/plugins/DevicePlugins/Reports/Base.php +++ b/plugins/DevicePlugins/Reports/Base.php @@ -13,6 +13,8 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; abstract class Base extends \Piwik\Plugin\Report { + protected $defaultSortColumn = 'nb_visits'; + protected function init() { $this->category = 'General_VisitorSettings'; diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index 36fcd8fb95..1f4a53e48c 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -34,7 +34,6 @@ class API extends \Piwik\Plugin\API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); return $dataTable; diff --git a/plugins/DevicesDetection/Reports/Base.php b/plugins/DevicesDetection/Reports/Base.php index 7ca883af3f..9683678ed7 100644 --- a/plugins/DevicesDetection/Reports/Base.php +++ b/plugins/DevicesDetection/Reports/Base.php @@ -8,8 +8,12 @@ */ namespace Piwik\Plugins\DevicesDetection\Reports; +use Piwik\Metrics; + abstract class Base extends \Piwik\Plugin\Report { + protected $defaultSortColumn = 'nb_visits'; + protected function init() { $this->category = 'DevicesDetection_DevicesDetection'; diff --git a/plugins/Resolution/API.php b/plugins/Resolution/API.php index 8a39d78e0b..767cb0ff70 100644 --- a/plugins/Resolution/API.php +++ b/plugins/Resolution/API.php @@ -28,7 +28,6 @@ class API extends \Piwik\Plugin\API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); return $dataTable; diff --git a/plugins/Resolution/Reports/Base.php b/plugins/Resolution/Reports/Base.php index 259a164113..bd2c33ffda 100644 --- a/plugins/Resolution/Reports/Base.php +++ b/plugins/Resolution/Reports/Base.php @@ -13,6 +13,8 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; abstract class Base extends \Piwik\Plugin\Report { + protected $defaultSortColumn = 'nb_visits'; + protected function init() { $this->category = 'General_VisitorSettings'; diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 38408b39e6..bd10d6f0ad 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -203,7 +203,6 @@ class API extends \Piwik\Plugin\API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ReplaceColumnNames'); return $dataTable; } diff --git a/plugins/UserCountry/Reports/Base.php b/plugins/UserCountry/Reports/Base.php index f7a4f34203..5c173ca945 100644 --- a/plugins/UserCountry/Reports/Base.php +++ b/plugins/UserCountry/Reports/Base.php @@ -15,6 +15,8 @@ use Piwik\Url; abstract class Base extends \Piwik\Plugin\Report { + protected $defaultSortColumn = 'nb_visits'; + protected function init() { $this->category = 'General_Visitors'; |