diff options
Diffstat (limited to 'plugins')
32 files changed, 96 insertions, 62 deletions
diff --git a/plugins/Contents/API.php b/plugins/Contents/API.php index 968231a702..574a24e9a3 100644 --- a/plugins/Contents/API.php +++ b/plugins/Contents/API.php @@ -57,8 +57,6 @@ class API extends \Piwik\Plugin\API */ private function filterDataTable($dataTable) { - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); - $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); $dataTable->filter(function (DataTable $table) { diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml index 2f19e727d9..7b1f18f074 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml @@ -53,13 +53,13 @@ <interaction_rate>100%</interaction_rate> </row> <row> - <label>movie.mov</label> + <label>Content Piece not defined</label> <nb_impressions>2</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> </row> <row> - <label>Content Piece not defined</label> + <label>movie.mov</label> <nb_impressions>2</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> @@ -102,11 +102,11 @@ </row> <row> <contentTarget /> - <segment>contentPiece==movie.mov</segment> </row> <row> <contentTarget /> + <segment>contentPiece==movie.mov</segment> </row> <row> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml index a7e56b692a..fb7e0486ad 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml @@ -41,23 +41,23 @@ <segment>contentPiece==Click+NOW</segment> </row> <row> - <label>movie.mov</label> + <label>Content Piece not defined</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_impressions>2</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget /> - <segment>contentPiece==movie.mov</segment> </row> <row> - <label>Content Piece not defined</label> + <label>movie.mov</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_impressions>2</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segment>contentPiece==movie.mov</segment> </row> <row> <label>Unknown</label> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml index 56da535eeb..512fcdb391 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml @@ -41,23 +41,23 @@ <segment>contentPiece==Click+NOW</segment> </row> <row> - <label>movie.mov</label> + <label>Content Piece not defined</label> <nb_visits>2</nb_visits> <nb_impressions>2</nb_impressions> <nb_interactions>0</nb_interactions> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <interaction_rate>0%</interaction_rate> <contentTarget /> - <segment>contentPiece==movie.mov</segment> </row> <row> - <label>Content Piece not defined</label> + <label>movie.mov</label> <nb_visits>2</nb_visits> <nb_impressions>2</nb_impressions> <nb_interactions>0</nb_interactions> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <interaction_rate>0%</interaction_rate> <contentTarget /> + <segment>contentPiece==movie.mov</segment> </row> <row> <label>Unknown</label> diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php index 1a6fc8c794..36d4e1ff9a 100644 --- a/plugins/CustomVariables/API.php +++ b/plugins/CustomVariables/API.php @@ -34,7 +34,6 @@ class API extends \Piwik\Plugin\API protected function getDataTable($idSite, $period, $date, $segment, $expanded, $flat, $idSubtable) { $dataTable = Archive::createDataTableFromArchive(Archiver::CUSTOM_VARIABLE_RECORD_NAME, $idSite, $period, $date, $segment, $expanded, $flat, $idSubtable); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_ACTIONS, 'desc', $naturalSort = false, $expanded)); $dataTable->queueFilter('ColumnDelete', 'nb_uniq_visitors'); if ($flat) { diff --git a/plugins/CustomVariables/Reports/Base.php b/plugins/CustomVariables/Reports/Base.php index 4a19c0a763..be48bf4d44 100644 --- a/plugins/CustomVariables/Reports/Base.php +++ b/plugins/CustomVariables/Reports/Base.php @@ -10,6 +10,8 @@ namespace Piwik\Plugins\CustomVariables\Reports; abstract class Base extends \Piwik\Plugin\Report { + protected $defaultSortColumn = 'nb_actions'; + protected function init() { $this->category = 'General_Visitors'; diff --git a/plugins/DevicePlugins/Reports/Base.php b/plugins/DevicePlugins/Reports/Base.php index 06eebe686c..81116f4d1d 100644 --- a/plugins/DevicePlugins/Reports/Base.php +++ b/plugins/DevicePlugins/Reports/Base.php @@ -13,8 +13,6 @@ 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 1f4a53e48c..b6e484f924 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -216,7 +216,11 @@ class API extends \Piwik\Plugin\API */ public function getBrowserFamilies($idSite, $period, $date, $segment = false) { - return $this->getBrowsers($idSite, $period, $date, $segment); + $table = $this->getBrowsers($idSite, $period, $date, $segment); + // this one will not be sorted automatically by nb_visits since there is no Report class for it. + $table->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc')); + + return $table; } /** diff --git a/plugins/DevicesDetection/Reports/Base.php b/plugins/DevicesDetection/Reports/Base.php index 9683678ed7..15eac96a4a 100644 --- a/plugins/DevicesDetection/Reports/Base.php +++ b/plugins/DevicesDetection/Reports/Base.php @@ -12,8 +12,6 @@ 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/Ecommerce/Reports/BaseItem.php b/plugins/Ecommerce/Reports/BaseItem.php index 693f0074de..5caf770a6b 100644 --- a/plugins/Ecommerce/Reports/BaseItem.php +++ b/plugins/Ecommerce/Reports/BaseItem.php @@ -21,6 +21,8 @@ use Piwik\Plugins\Goals\Columns\Metrics\ProductConversionRate; abstract class BaseItem extends Base { + protected $defaultSortColumn = 'revenue'; + protected function init() { parent::init(); diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 46f521375e..e4ecb322e5 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -230,8 +230,6 @@ class API extends \Piwik\Plugin\API $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($recordNameFinal); - $dataTable->filter('Sort', array(Metrics::INDEX_ECOMMERCE_ITEM_REVENUE)); - $this->enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date, $segment); // First rename the avg_price_viewed column @@ -241,7 +239,6 @@ class API extends \Piwik\Plugin\API $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); - $ordersColumn = 'orders'; if ($abandonedCarts) { $ordersColumn = 'abandoned_carts'; $dataTable->renameColumn(Metrics::INDEX_ECOMMERCE_ORDERS, $ordersColumn); @@ -483,7 +480,7 @@ class API extends \Piwik\Plugin\API $dataTable = $this->getGoalSpecificDataTable( Archiver::DAYS_UNTIL_CONV_RECORD_NAME, $idSite, $period, $date, $segment, $idGoal); - $dataTable->queueFilter('Sort', array('label', 'asc', true)); + $dataTable->queueFilter('Sort', array('label', 'asc', true, false)); $dataTable->queueFilter( 'BeautifyRangeLabels', array(Piwik::translate('General_OneDay'), Piwik::translate('General_NDays'))); @@ -507,7 +504,7 @@ class API extends \Piwik\Plugin\API $dataTable = $this->getGoalSpecificDataTable( Archiver::VISITS_UNTIL_RECORD_NAME, $idSite, $period, $date, $segment, $idGoal); - $dataTable->queueFilter('Sort', array('label', 'asc', true)); + $dataTable->queueFilter('Sort', array('label', 'asc', true, false)); $dataTable->queueFilter( 'BeautifyRangeLabels', array(Piwik::translate('General_OneVisit'), Piwik::translate('General_NVisits'))); diff --git a/plugins/Goals/Reports/GetDaysToConversion.php b/plugins/Goals/Reports/GetDaysToConversion.php index d41f2e8f06..a6a5060782 100644 --- a/plugins/Goals/Reports/GetDaysToConversion.php +++ b/plugins/Goals/Reports/GetDaysToConversion.php @@ -15,6 +15,8 @@ use Piwik\Plugins\Goals\Archiver; class GetDaysToConversion extends Base { + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/Goals/Reports/GetVisitsUntilConversion.php b/plugins/Goals/Reports/GetVisitsUntilConversion.php index ddf1da1fd9..649ffac17b 100644 --- a/plugins/Goals/Reports/GetVisitsUntilConversion.php +++ b/plugins/Goals/Reports/GetVisitsUntilConversion.php @@ -15,6 +15,8 @@ use Piwik\Plugins\Goals\Archiver; class GetVisitsUntilConversion extends Base { + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/Live/Reports/GetLastVisits.php b/plugins/Live/Reports/GetLastVisits.php new file mode 100644 index 0000000000..58d027ff72 --- /dev/null +++ b/plugins/Live/Reports/GetLastVisits.php @@ -0,0 +1,22 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\Live\Reports; + + +class GetLastVisits extends Base +{ + // this class only exists to disable the default sort column + protected $defaultSortColumn = ''; + + public function buildReportMetadata() + { + // do not add this report as metadata + } + +} diff --git a/plugins/Live/Reports/GetLastVisitsDetails.php b/plugins/Live/Reports/GetLastVisitsDetails.php index 7d5318b588..c54c97e924 100644 --- a/plugins/Live/Reports/GetLastVisitsDetails.php +++ b/plugins/Live/Reports/GetLastVisitsDetails.php @@ -15,6 +15,8 @@ use Piwik\WidgetsList; class GetLastVisitsDetails extends Base { + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/Provider/API.php b/plugins/Provider/API.php index bd4b5c6676..e11eaf54cc 100644 --- a/plugins/Provider/API.php +++ b/plugins/Provider/API.php @@ -29,7 +29,6 @@ class API extends \Piwik\Plugin\API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable(Archiver::PROVIDER_RECORD_NAME); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getHostnameUrl')); $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getPrettyProviderName')); $dataTable->queueFilter('ReplaceColumnNames'); diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php index 2cacbb2833..c615e69ed5 100644 --- a/plugins/Referrers/API.php +++ b/plugins/Referrers/API.php @@ -130,7 +130,6 @@ class API extends \Piwik\Plugin\API } $dataTable = $dataTable->mergeSubtables($labelColumn = 'referer_type', $useMetadataColumn = true); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc')); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); diff --git a/plugins/Referrers/DataTable/Filter/UrlsForSocial.php b/plugins/Referrers/DataTable/Filter/UrlsForSocial.php index ad86093060..0d61a8887f 100644 --- a/plugins/Referrers/DataTable/Filter/UrlsForSocial.php +++ b/plugins/Referrers/DataTable/Filter/UrlsForSocial.php @@ -43,7 +43,6 @@ class UrlsForSocial extends BaseFilter // prettify the DataTable $table->filter('ColumnCallbackReplace', array('label', 'Piwik\Plugins\Referrers\removeUrlProtocol')); - $table->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc', $naturalSort = false, $this->sortRecursive)); $table->queueFilter('ReplaceColumnNames'); } }
\ No newline at end of file diff --git a/plugins/Resolution/Reports/Base.php b/plugins/Resolution/Reports/Base.php index bd2c33ffda..259a164113 100644 --- a/plugins/Resolution/Reports/Base.php +++ b/plugins/Resolution/Reports/Base.php @@ -13,8 +13,6 @@ 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/Reports/Base.php b/plugins/UserCountry/Reports/Base.php index 5c173ca945..f7a4f34203 100644 --- a/plugins/UserCountry/Reports/Base.php +++ b/plugins/UserCountry/Reports/Base.php @@ -15,8 +15,6 @@ use Piwik\Url; abstract class Base extends \Piwik\Plugin\Report { - protected $defaultSortColumn = 'nb_visits'; - protected function init() { $this->category = 'General_Visitors'; diff --git a/plugins/UserLanguage/API.php b/plugins/UserLanguage/API.php index 30d6ffd8ce..3baa4cc159 100644 --- a/plugins/UserLanguage/API.php +++ b/plugins/UserLanguage/API.php @@ -30,7 +30,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/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml index 02c15ad520..704c934193 100644 --- a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml +++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml @@ -45,7 +45,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Czech - Czech Republic (cs-cz)</label> + <label>Basque - Spain (eu-es)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -56,7 +56,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>German (de)</label> + <label>Chinese - Singapore (zh-sg)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -67,7 +67,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Greek - Greece (el-gr)</label> + <label>Czech - Czech Republic (cs-cz)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -78,7 +78,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Basque - Spain (eu-es)</label> + <label>French (fr)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -89,7 +89,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>French (fr)</label> + <label>French - Switzerland (fr-ch)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -100,7 +100,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>French - Switzerland (fr-ch)</label> + <label>German (de)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -111,7 +111,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Serbian - Serbia Montenegro (sr-cs)</label> + <label>Greek - Greece (el-gr)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -122,7 +122,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Thai (th)</label> + <label>Serbian - Serbia Montenegro (sr-cs)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -133,7 +133,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Unknown (xx)</label> + <label>Thai (th)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -144,7 +144,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Chinese - Singapore (zh-sg)</label> + <label>Unknown (xx)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml index 18d4468a2e..04af2f2ccf 100644 --- a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml +++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>French</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> + <row> <label>Polish</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>3</nb_visits> @@ -23,17 +34,6 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>French</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> <label>Arabic</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> @@ -45,7 +45,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Czech</label> + <label>Basque</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -56,7 +56,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>German</label> + <label>Chinese</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -67,7 +67,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Greek</label> + <label>Czech</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -78,7 +78,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Basque</label> + <label>German</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -89,7 +89,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Serbian</label> + <label>Greek</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -100,7 +100,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Thai</label> + <label>Serbian</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -111,7 +111,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Unknown</label> + <label>Thai</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -122,7 +122,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Chinese</label> + <label>Unknown</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php index 928e8c95f3..e1f90db70e 100644 --- a/plugins/VisitTime/API.php +++ b/plugins/VisitTime/API.php @@ -33,7 +33,7 @@ class API extends \Piwik\Plugin\API $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array('label', 'asc', true)); + $dataTable->filter('Sort', array('label', 'asc', true, false)); $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getTimeLabel')); $dataTable->queueFilter('ReplaceColumnNames'); return $dataTable; diff --git a/plugins/VisitTime/Reports/GetByDayOfWeek.php b/plugins/VisitTime/Reports/GetByDayOfWeek.php index d695ba5a7e..d9a3a58ee8 100644 --- a/plugins/VisitTime/Reports/GetByDayOfWeek.php +++ b/plugins/VisitTime/Reports/GetByDayOfWeek.php @@ -18,6 +18,8 @@ use Piwik\Site; class GetByDayOfWeek extends Base { + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php b/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php index bbc9aa5b1b..6546463cd1 100644 --- a/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php +++ b/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php @@ -16,6 +16,9 @@ use Piwik\Plugins\VisitTime\Columns\LocalTime; class GetVisitInformationPerLocalTime extends Base { + + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php b/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php index ea8e1b9f7e..ce213fb211 100644 --- a/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php +++ b/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php @@ -15,6 +15,9 @@ use Piwik\Plugins\VisitTime\Columns\ServerTime; class GetVisitInformationPerServerTime extends Base { + + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php index 33f6d97b58..74f050c33a 100644 --- a/plugins/VisitorInterest/API.php +++ b/plugins/VisitorInterest/API.php @@ -33,7 +33,7 @@ class API extends \Piwik\Plugin\API public function getNumberOfVisitsPerVisitDuration($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable(Archiver::TIME_SPENT_RECORD_NAME, $idSite, $period, $date, $segment); - $dataTable->queueFilter('Sort', array('label', 'asc', true)); + $dataTable->queueFilter('Sort', array('label', 'asc', true, false)); $dataTable->queueFilter('BeautifyTimeRangeLabels', array( Piwik::translate('VisitorInterest_BetweenXYSeconds'), Piwik::translate('VisitorInterest_OneMinute'), @@ -44,7 +44,7 @@ class API extends \Piwik\Plugin\API public function getNumberOfVisitsPerPage($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable(Archiver::PAGES_VIEWED_RECORD_NAME, $idSite, $period, $date, $segment); - $dataTable->queueFilter('Sort', array('label', 'asc', true)); + $dataTable->queueFilter('Sort', array('label', 'asc', true, false)); $dataTable->queueFilter('BeautifyRangeLabels', array( Piwik::translate('VisitorInterest_OnePage'), Piwik::translate('VisitorInterest_NPages'))); diff --git a/plugins/VisitorInterest/Reports/GetNumberOfVisitsByDaysSinceLast.php b/plugins/VisitorInterest/Reports/GetNumberOfVisitsByDaysSinceLast.php index c5a2aa471b..fd935d47c6 100644 --- a/plugins/VisitorInterest/Reports/GetNumberOfVisitsByDaysSinceLast.php +++ b/plugins/VisitorInterest/Reports/GetNumberOfVisitsByDaysSinceLast.php @@ -14,6 +14,8 @@ use Piwik\Plugins\VisitorInterest\Columns\VisitsByDaysSinceLastVisit; class GetNumberOfVisitsByDaysSinceLast extends Base { + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php b/plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php index 0cebfe2e2a..74dbf69c14 100644 --- a/plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php +++ b/plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php @@ -16,6 +16,8 @@ use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent; class GetNumberOfVisitsByVisitCount extends Base { + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerPage.php b/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerPage.php index 355b694406..de15ed5f5f 100644 --- a/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerPage.php +++ b/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerPage.php @@ -16,6 +16,8 @@ use Piwik\Plugins\VisitorInterest\Columns\PagesPerVisit; class GetNumberOfVisitsPerPage extends Base { + protected $defaultSortColumn = ''; + protected function init() { parent::init(); diff --git a/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerVisitDuration.php b/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerVisitDuration.php index f518ce47c2..ead1849b7f 100644 --- a/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerVisitDuration.php +++ b/plugins/VisitorInterest/Reports/GetNumberOfVisitsPerVisitDuration.php @@ -16,6 +16,8 @@ use Piwik\Plugins\VisitorInterest\Columns\VisitDuration; class GetNumberOfVisitsPerVisitDuration extends Base { + protected $defaultSortColumn = ''; + protected function init() { parent::init(); |