Skip to content
Extraits de code Groupes Projets
Valider fcbb47d7 rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Refs #6078, make sure pivot option does not display if table is not pivotted...

Refs #6078, make sure pivot option does not display if table is not pivotted and has no subtables (eg, when flattened).
parent 89ce4280
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -297,6 +297,11 @@ class Visualization extends ViewDataTable ...@@ -297,6 +297,11 @@ class Visualization extends ViewDataTable
$this->config->report_last_updated_message = $this->makePrettyArchivedOnText(); $this->config->report_last_updated_message = $this->makePrettyArchivedOnText();
} }
} }
$pivotBy = Common::getRequestVar('pivotBy', false) ?: $this->requestConfig->pivotBy;
if (empty($pivotBy)) {
$this->config->disablePivotBySubtableIfTableHasNoSubtables($this->dataTable);
}
} }
private function applyFilters() private function applyFilters()
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
namespace Piwik\ViewDataTable; namespace Piwik\ViewDataTable;
use Piwik\API\Request as ApiRequest; use Piwik\API\Request as ApiRequest;
use Piwik\DataTable;
use Piwik\DataTable\Filter\PivotByDimension; use Piwik\DataTable\Filter\PivotByDimension;
use Piwik\Metrics; use Piwik\Metrics;
use Piwik\Plugin\Report; use Piwik\Plugin\Report;
...@@ -682,4 +683,15 @@ class Config ...@@ -682,4 +683,15 @@ class Config
} }
} }
} }
public function disablePivotBySubtableIfTableHasNoSubtables(DataTable $table)
{
foreach ($table->getRows() as $row) {
if ($row->getIdSubDataTable() !== null) {
return;
}
}
$this->show_pivot_by_subtable = false;
}
} }
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter