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:
authorStefan Giehl <stefan@matomo.org>2022-09-21 08:54:24 +0300
committerGitHub <noreply@github.com>2022-09-21 08:54:24 +0300
commit61887bf529355be6a188f37fe6a8e942c1bd5879 (patch)
tree946a3fc6eea9a776db36695a58c8f143924e0626
parentb5912141b353e5e7d3d87920e379a17bbc8fc6f5 (diff)
Improve no data check in html visualization (#19740)
-rw-r--r--core/Plugin/Visualization.php1
-rw-r--r--plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig2
2 files changed, 2 insertions, 1 deletions
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>