Refs #4041, fixing regressions & bugs in visualization refactor.

1 files changed, 10 insertions, 3 deletions

diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
index 1347218af0..a5ba98ac72 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
@@ -1,13 +1,20 @@
+{%- set subtablesAreDisabled = properties.visualization_properties.show_goals_columns|default(false)
+                           and properties.visualization_properties.disable_subtable_when_show_goals|default(false) -%}
 <table cellspacing="0" class="dataTable">
     {% include "@CoreHome/_dataTableHead.twig" %}
 
     <tbody>
     {% for rowId, row in dataTable.getRows() %}
-        {%- set rowHasSubtable = row.getIdSubDataTable() and properties.subtable_controller_action is not null -%}
+        {%- set rowHasSubtable = not subtablesAreDisabled and row.getIdSubDataTable() and properties.subtable_controller_action is not null -%}
         {%- set shouldHighlightRow = rowId == constant('Piwik\\DataTable::ID_SUMMARY_ROW') and properties.highlight_summary_row -%}
-        
+
         {# display this row if it doesn't have a subtable or if we don't replace the row with the subtable #}
-        {% if not rowHasSubtable or not properties.visualization_properties.show_expanded|default(false) or not properties.replace_row_with_subtable|default(false) %}
+        {%- set showRow = subtablesAreDisabled
+                       or not rowHasSubtable
+                       or not properties.visualization_properties.show_expanded|default(false)
+                       or not properties.visualization_properties.replace_row_with_subtable|default(false) -%}
+
+        {% if showRow %}
         <tr {% if rowHasSubtable %}id="{{ row.getIdSubDataTable() }}"{% endif %}
             class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}">
             {% for column in properties.columns_to_display %}