diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2022-09-23 03:14:56 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2022-09-23 03:14:56 +0300 |
| commit | 6032478f02ae5ee171a68147a6f7c06b4c430174 (patch) | |
| tree | f21a69860050d70d235929f6772a2e587fd219df | |
| parent | dbbc88d5c7093c6636c323a174a94cadde6d6e2f (diff) | |
| parent | 61887bf529355be6a188f37fe6a8e942c1bd5879 (diff) | |
Merge branch '4.x-dev' into 5.x-dev
| -rw-r--r-- | core/Plugin/Controller.php | 7 | ||||
| -rw-r--r-- | core/Plugin/Visualization.php | 1 | ||||
| -rw-r--r-- | plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php index c8332097dd..83f3be6ad9 100644 --- a/core/Plugin/Controller.php +++ b/core/Plugin/Controller.php @@ -14,6 +14,7 @@ use Piwik\API\Proxy; use Piwik\API\Request; use Piwik\Common; use Piwik\Config as PiwikConfig; +use Piwik\Config\GeneralConfig; use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Exception\NoPrivilegesException; @@ -629,10 +630,10 @@ abstract class Controller $maxDate = Date::factory('now', $siteTimezone); $this->setMaxDateView($maxDate, $view); - $rawDate = Piwik::getDate(); + $rawDate = Piwik::getDate(GeneralConfig::getConfigValue('default_day')); Period::checkDateFormat($rawDate); - $periodStr = Piwik::getPeriod(); + $periodStr = Piwik::getPeriod(GeneralConfig::getConfigValue('default_period')); if ($periodStr !== 'range') { $date = Date::factory($this->strDate); @@ -913,7 +914,7 @@ abstract class Controller $periodValidator = new PeriodValidator(); - $currentPeriod = Piwik::getPeriod(); + $currentPeriod = Piwik::getPeriod(GeneralConfig::getConfigValue('default_period')); $availablePeriods = $periodValidator->getPeriodsAllowedForUI(); if (! $periodValidator->isPeriodAllowedForUI($currentPeriod)) { diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php index fbf320756f..fe52dd85ff 100644 --- a/core/Plugin/Visualization.php +++ b/core/Plugin/Visualization.php @@ -225,6 +225,7 @@ class Visualization extends ViewDataTable if (null === $this->dataTable) { $view->dataTable = null; + $view->dataTableHasNoData = true; } else { $view->dataTableHasNoData = !$this->isThereDataToDisplay(); $view->dataTable = $this->dataTable; diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index 6178e33cec..89c79c4f86 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -12,7 +12,7 @@ <tbody> {%- endif -%} - {% if showingEmbeddedSubtable and dataTable.getRowsCount() == 0 %} + {% if showingEmbeddedSubtable and dataTableHasNoData %} {% if clientSideParameters is not defined or clientSideParameters.filter_pattern_recursive is not defined or not clientSideParameters.filter_pattern_recursive %} <tr class="nodata"> <td colspan="{{ properties.columns_to_display|length }}">{{ 'CoreHome_CategoryNoData'|translate }}</td> |