Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenaka <diosmosis@users.noreply.github.com>2018-05-04 03:17:06 +0300
committerGitHub <noreply@github.com>2018-05-04 03:17:06 +0300
commit453e3fbdabbf8c72264a3e15e2650cfad99b06b2 (patch)
tree18a4816bf85c3e4a33a916ef01a53158de3cc519 /plugins/Live
parent83ae9176c7877155b5d793835a7a5ebc0db2127e (diff)
Do not show 'all' limit selector option for VisitorLog & default to 25 if filter_limit=-1 used (#12790)
* Add disable_all_rows_filter_limit viewdatatable config option & use in visitorlog visualization. * If -1 filter_limit is used w/ visitor log visualization, change it to 25 (which is in the datatable_row_limits default config value). * Use datatable_default_limit as limit to set when unsupported filter_limit used in VisitorLog visualization. * Update screenshots.
Diffstat (limited to 'plugins/Live')
-rw-r--r--plugins/Live/Visualizations/VisitorLog.php9
-rw-r--r--plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.pngbin131 -> 402671 bytes
2 files changed, 7 insertions, 2 deletions
diff --git a/plugins/Live/Visualizations/VisitorLog.php b/plugins/Live/Visualizations/VisitorLog.php
index f6c7790f14..575b603d7d 100644
--- a/plugins/Live/Visualizations/VisitorLog.php
+++ b/plugins/Live/Visualizations/VisitorLog.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\Live\Visualizations;
use Piwik\Common;
+use Piwik\Config;
use Piwik\DataTable;
use Piwik\Piwik;
use Piwik\Plugin;
@@ -43,8 +44,11 @@ class VisitorLog extends Visualization
'filter_sort_order',
));
- if (!is_numeric($this->requestConfig->filter_limit)) {
- $this->requestConfig->filter_limit = 20;
+ if (!is_numeric($this->requestConfig->filter_limit)
+ || $this->requestConfig->filter_limit == -1 // 'all' is not supported for this visualization
+ ) {
+ $defaultLimit = Config::getInstance()->General['datatable_default_limit'];
+ $this->requestConfig->filter_limit = $defaultLimit;
}
$this->requestConfig->disable_generic_filters = true;
@@ -83,6 +87,7 @@ class VisitorLog extends Visualization
$this->config->show_all_views_icons = false;
$this->config->show_table_all_columns = false;
$this->config->show_export_as_rss_feed = false;
+ $this->config->disable_all_rows_filter_limit = true;
$this->config->documentation = Piwik::translate('Live_VisitorLogDocumentation', array('<br />', '<br />'));
diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
index 6dcf9b7c49..1072bd2b5c 100644
--- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
+++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png
Binary files differ