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

2 files changed, 5 insertions, 5 deletions

diff --git a/plugins/CoreHome/javascripts/datatable.js b/plugins/CoreHome/javascripts/datatable.js
index 6d35f66367..acbb96e7ef 100644
--- a/plugins/CoreHome/javascripts/datatable.js
+++ b/plugins/CoreHome/javascripts/datatable.js
@@ -1191,7 +1191,7 @@ dataTable.prototype =
                     self.param.enable_filter_excludelowpop = filtersToRestore.enable_filter_excludelowpop;
 
                     self.param.idSubtable = idSubTable;
-                    self.param.action = self.param.controllerActionCalledWhenRequestSubTable;
+                    self.param.action = self.props.subtable_controller_action;
 					
 					delete self.param.totalRows;
 					
@@ -1427,8 +1427,8 @@ dataTable.prototype =
     doHandleRowActions: function (trs) {
         var self = this;
 
-        var availableActionsForReport = DataTable_RowActions_Registry
-            .getAvailableActionsForReport(self.param);
+        var merged = $.extend({}, self.param, self.props);
+        var availableActionsForReport = DataTable_RowActions_Registry.getAvailableActionsForReport(merged);
 
         if (availableActionsForReport.length == 0) {
             return;
@@ -1759,7 +1759,7 @@ actionDataTable.prototype =
             this.param['enable_filter_excludelowpop'] = filtersToRestore['enable_filter_excludelowpop'];
 
             self.param.idSubtable = idSubTable;
-            self.param.action = self.param.controllerActionCalledWhenRequestSubTable;
+            self.param.action = self.props.subtable_controller_action;
 
             self.reloadAjaxDataTable(false, function (resp) {
                 self.actionsSubDataTableLoaded(resp, idSubTable);
diff --git a/plugins/CoreHome/javascripts/sparkline.js b/plugins/CoreHome/javascripts/sparkline.js
index 6093955eeb..222e44e490 100644
--- a/plugins/CoreHome/javascripts/sparkline.js
+++ b/plugins/CoreHome/javascripts/sparkline.js
@@ -62,7 +62,7 @@ window.initializeSparklines = function () {
                     // if this happens, we can't find the graph using $('#'+idDataTable+"Chart");
                     // instead, we just use the first evolution graph we can find.
                     if (dataTable.length == 0) {
-                        dataTable = $('div.dataTableEvolutionGraph');
+                        dataTable = $('div.dataTableVizEvolution');
                     }
 
                     // reload the datatable w/ a new column & scroll to the graph