diff options
Diffstat (limited to 'core/Plugin/Visualization.php')
| -rw-r--r-- | core/Plugin/Visualization.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php index 1c5a7a3bd8..e82a8d7f73 100644 --- a/core/Plugin/Visualization.php +++ b/core/Plugin/Visualization.php @@ -286,7 +286,7 @@ class Visualization extends ViewDataTable } if (empty($this->requestConfig->filter_sort_column)) { - $this->requestConfig->setDefaultSort($this->config->columns_to_display, $hasNbUniqVisitors); + $this->requestConfig->setDefaultSort($this->config->columns_to_display, $hasNbUniqVisitors, $columns); } // deal w/ table metadata @@ -297,6 +297,13 @@ class Visualization extends ViewDataTable $this->config->report_last_updated_message = $this->makePrettyArchivedOnText(); } } + + $pivotBy = Common::getRequestVar('pivotBy', false) ?: $this->requestConfig->pivotBy; + if (empty($pivotBy) + && $this->dataTable instanceof DataTable + ) { + $this->config->disablePivotBySubtableIfTableHasNoSubtables($this->dataTable); + } } private function applyFilters() @@ -312,7 +319,7 @@ class Visualization extends ViewDataTable if (!in_array($this->requestConfig->filter_sort_column, $this->config->columns_to_display)) { $hasNbUniqVisitors = in_array('nb_uniq_visitors', $this->config->columns_to_display); - $this->requestConfig->setDefaultSort($this->config->columns_to_display, $hasNbUniqVisitors); + $this->requestConfig->setDefaultSort($this->config->columns_to_display, $hasNbUniqVisitors, $this->dataTable->getColumns()); } if (!$this->requestConfig->areGenericFiltersDisabled()) { |