diff options
Diffstat (limited to 'plugins/CoreVisualizations')
4 files changed, 12 insertions, 8 deletions
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index 4065fd10f7..ef6ad37ea8 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -26,7 +26,6 @@ class AllColumns extends HtmlTable public function beforeRender() { $this->config->show_extra_columns = true; - $this->config->datatable_css_class = 'dataTableVizAllColumns'; $this->config->show_exclude_low_population = true; parent::beforeRender(); @@ -34,6 +33,8 @@ class AllColumns extends HtmlTable public function beforeGenericFiltersAreAppliedToLoadedDataTable() { + $this->config->datatable_css_class = 'dataTableVizAllColumns'; + $this->dataTable->filter('AddColumnsProcessedMetrics'); $properties = $this->config; @@ -67,7 +68,8 @@ class AllColumns extends HtmlTable public function beforeLoadDataTable() { - $this->requestConfig->request_parameters_to_modify['pivotBy'] = null; // always unset pivotBy + unset($this->requestConfig->request_parameters_to_modify['pivotBy']); + unset($this->requestConfig->request_parameters_to_modify['pivotByColumn']); } protected function isPivoted() diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php index 94cfa60050..a31a88d190 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php @@ -20,10 +20,10 @@ class Bar extends JqplotGraph const ID = 'graphVerticalBar'; const FOOTER_ICON = 'icon-chart-bar'; const FOOTER_ICON_TITLE = 'General_VBarGraph'; - - public function beforeRender() + + public function beforeLoadDataTable() { - parent::beforeRender(); + parent::beforeLoadDataTable(); $this->config->datatable_js_type = 'JqplotBarGraphDataTable'; } diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js index 5f51e7e341..e840a71537 100644 --- a/plugins/CoreVisualizations/javascripts/jqplot.js +++ b/plugins/CoreVisualizations/javascripts/jqplot.js @@ -282,7 +282,7 @@ * creating span elements with ticks and adding their width. * Rendered ticks have to be visible to get their real width. But it * is too fast for user to notice it. If total ticks width is bigger - * than container width then half of ticks is beeing cut out and their + * than container width then half of ticks is being cut out and their * width is tested again. Until their total width is smaller than chart * div. There is a failsafe so check will be performed no more than 20 * times, which is I think more than enough. Each tick have its own diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index 1fbbf6517f..a85ee66852 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -20,6 +20,7 @@ {% else %} {%- for rowId, row in dataTable.getRows() -%} {%- set rowHasSubtable = not subtablesAreDisabled and row.getIdSubDataTable() and properties.subtable_controller_action is not null -%} + {%- set rowSubtableId = row.getMetadata('idsubdatatable_in_db')|default(row.getIdSubDataTable()) -%} {%- set isSummaryRow = rowId == constant('Piwik\\DataTable::ID_SUMMARY_ROW') -%} {%- set shouldHighlightRow = isSummaryRow and properties.highlight_summary_row -%} @@ -30,9 +31,10 @@ or not properties.replace_row_with_subtable|default(false) -%} {% if showRow %} - <tr {% if rowHasSubtable %}id="{{ row.getIdSubDataTable() }}"{% endif %} + <tr {% if rowHasSubtable %}id="{{ rowSubtableId }}"{% endif %} {% if row.getMetadata('segment') is not false %} data-segment-filter="{{ row.getMetadata('segment')|e('html_attr') }}"{% endif %} {% if row.getMetadata('url') is not false %} data-url-label="{{ row.getMetadata('url')|rawSafeDecoded }}"{% endif %} + data-row-metadata="{{ row.getMetadata|json_encode|e('html_attr') }}" class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}" {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}> {% for column in properties.columns_to_display %} @@ -45,7 +47,7 @@ {# display subtable if present and showing expanded datatable #} {% if properties.show_expanded|default(false) and rowHasSubtable %} - {% include "@CoreVisualizations/_dataTableViz_htmlTable.twig" with {'dataTable': row.getSubtable(), 'idSubtable': row.getIdSubDataTable()} %} + {% include "@CoreVisualizations/_dataTableViz_htmlTable.twig" with {'dataTable': row.getSubtable(), 'idSubtable': rowSubtableId} %} {% endif %} {%- endfor -%} {% endif %} |