diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-08-28 09:33:55 +0300 |
---|---|---|
committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-08-28 09:33:55 +0300 |
commit | 77a6412ff7a8bdb2f23fb00a2d8ce22e7a35fcee (patch) | |
tree | 32100fa64ee556f1fd125751bb7c619dc73200bf /plugins/CoreVisualizations/Visualizations | |
parent | ba0a9d53f41a96c994d9bb1c8298d97c0400060c (diff) |
Split piwik.js into multiple files and provide a merged one (#10441)
refs #6106
Diffstat (limited to 'plugins/CoreVisualizations/Visualizations')
-rw-r--r-- | plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php | 3 | ||||
-rw-r--r-- | plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index 90066a187a..ca699274c0 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; diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php index 121cfdc315..84b53bae88 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 = 'plugins/Morpheus/images/chart_bar.png'; const FOOTER_ICON_TITLE = 'General_VBarGraph'; - - public function beforeRender() + + public function beforeLoadDataTable() { - parent::beforeRender(); + parent::beforeLoadDataTable(); $this->config->datatable_js_type = 'JqplotBarGraphDataTable'; } |