Split piwik.js into multiple files and provide a merged one (#10441)

refs #6106

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';
     }