Refs #4041, allow subtable template to be used if idSubtable is in request so Actions controller doesn't have to call setTemplate. Also did some mild refactoring for Piwik_ViewDataTable_HtmlTable::setRecursiveLoadDataTableIfSearchingForPattern.

1 files changed, 4 insertions, 7 deletions

diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php
index d8bf8a12c6..4980cd7764 100644
--- a/plugins/Actions/Controller.php
+++ b/plugins/Actions/Controller.php
@@ -454,14 +454,11 @@ class Piwik_Actions_Controller extends Piwik_Controller
     {
         $view->setDataTableType('dataTableActions');
         $view->setJsType('actionDataTable');
+        $view->setSubtableTemplate('@CoreHome/_dataTableActions_subDataTable.twig');
         
-        
-        if (Piwik_Common::getRequestVar('idSubtable', -1) != -1) {
-            $view->setTemplate('@CoreHome/_dataTableActions_subDataTable');
-        }
-        $currentlySearching = $view->setSearchRecursive();
-        if ($currentlySearching) {
-            $view->showExpanded($subtableTemplate = '@CoreHome/_dataTableActions_subDataTable.twig');
+        $view->setSearchRecursive();
+        if ($view->isLoadingExpandedDataTable()) {
+            $view->showExpanded();
             
             // set levelN css class for each row
             $self = $this;