Refs #4041, remove subtable_template property and _dataTableActions_subDataTable.twig file.

2 files changed, 6 insertions, 28 deletions

diff --git a/plugins/CoreHome/templates/_dataTable.twig b/plugins/CoreHome/templates/_dataTable.twig
index 8aedae0dd5..aa039d7854 100644
--- a/plugins/CoreHome/templates/_dataTable.twig
+++ b/plugins/CoreHome/templates/_dataTable.twig
@@ -1,3 +1,7 @@
+{% if properties.show_visualization_only %}
+    {{ visualization.render(dataTable, properties)|raw }}
+{%- else -%}
+
 {% set summaryRowId = constant('Piwik\\DataTable::ID_SUMMARY_ROW') %}{# ID_SUMMARY_ROW #}
 {% set isSubtable = javascriptVariablesToSet.idSubtable is defined and javascriptVariablesToSet.idSubtable != 0 %}
 <div class="dataTable {{ visualizationCssClass }} {{ properties.datatable_css_class|default('') }} {% if isSubtable %}subDataTable{% endif %}"
@@ -32,3 +36,5 @@
         {% endif %}
     </div>
 </div>
+
+{%- endif %}
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig b/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
deleted file mode 100644
index 696c4a5a72..0000000000
--- a/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
+++ /dev/null
@@ -1,28 +0,0 @@
-{% if error is defined %}
-    {{ error.message }}
-{% else %}
-    {% if (dataTable is empty or dataTable.getRowsCount() == 0) and not properties.visualization_properties.show_expanded|default(false) %}
-        <tr>
-            <td colspan="{{ properties.columns_to_display|length }}">{{ 'CoreHome_CategoryNoData'|translate }}</td>
-        </tr>
-    {% else %}
-        {% for row in dataTable.getRows() %}
-            {# display this row if it doesn't have a subtable or if we don't replace the row with the subtable #}
-            {% if not row.getIdSubDataTable() or not properties.visualization_properties.show_expanded|default(false) or not properties.replace_row_with_subtable|default(false) %}
-            <tr {% if row.getIdSubDataTable() %}id="{{ row.getIdSubDataTable() }}"{% endif %}
-                class="{{ row.getMetadata('css_class') }} {% if row.getIdSubDataTable() %}subDataTable{% endif %}">
-                {% for column in properties.columns_to_display %}
-                    <td>
-                        {% include "@CoreHome/_dataTableCell.twig" %}
-                    </td>
-                {% endfor %}
-            </tr>
-            {% endif %}
-            
-            {# display subtable if present and showing expanded datatable #}
-            {% if properties.visualization_properties.show_expanded|default(false) and row.getIdSubDataTable() %}
-                {% include properties.visualization_properties.subtable_template|default("@CoreHome/_dataTable.twig") with {'dataTable': row.getSubtable()} %}
-            {% endif %}
-        {% endfor %}
-    {% endif %}
-{% endif %}