diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2019-10-22 07:52:32 +0300 |
---|---|---|
committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2019-10-22 07:52:32 +0300 |
commit | 508fab3b39be060b636dbd19684f9378d11cc92e (patch) | |
tree | 8381fb257a826d2c7f7e7b7d18e3e7e1ef89047a /plugins/Live | |
parent | 194a82021e781bcbeef35917c4a8d0f08ca71f0f (diff) |
Fix possible notice some ViewDataTable::requestConfig properties have changed (#15035)
Diffstat (limited to 'plugins/Live')
-rw-r--r-- | plugins/Live/Visualizations/VisitorLog.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/Live/Visualizations/VisitorLog.php b/plugins/Live/Visualizations/VisitorLog.php index 9d637af6f4..31c0efcd9e 100644 --- a/plugins/Live/Visualizations/VisitorLog.php +++ b/plugins/Live/Visualizations/VisitorLog.php @@ -54,6 +54,10 @@ class VisitorLog extends Visualization $this->requestConfig->filter_limit = $defaultLimit; } + if ($this->isInPopover()) { + $this->requestConfig->filter_limit = 10; + } + $this->requestConfig->request_parameters_to_modify['filter_limit'] = $this->requestConfig->filter_limit+1; // request one more record, to check if a next page is available $this->requestConfig->disable_generic_filters = true; $this->requestConfig->filter_sort_column = false; @@ -78,6 +82,11 @@ class VisitorLog extends Visualization $this->requestConfig->filter_sort_column = false; } + private function isInPopover() + { + return Common::getRequestVar('inPopover', '0') !== '0'; + } + /** * Configure visualization. */ @@ -112,7 +121,7 @@ class VisitorLog extends Visualization $this->config->custom_parameters['hideProfileLink'] = (int)(1 == Common::getRequestVar('hideProfileLink', 0, 'int')); $this->config->custom_parameters['pageUrlNotDefined'] = Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageURL')); - if (Common::getRequestVar('inPopover', '0') === '0') { + if (!$this->isInPopover()) { $this->config->footer_icons = array( array( 'class' => 'tableAllColumnsSwitch', @@ -131,7 +140,6 @@ class VisitorLog extends Visualization $this->config->show_export = false; $this->config->show_pagination_control = false; $this->config->show_limit_control = false; - $this->requestConfig->filter_limit = 10; } $this->assignTemplateVar('actionsToDisplayCollapsed', StaticContainer::get('Live.pageViewActionsToDisplayCollapsed')); |