Refs #4040, #4041, move more logic out of HtmlTable ViewDataTable class.

matomo-org · Aug 1, 2013 · 883c322 · 883c322
1 parent 0f61caa
commit 883c322
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
@@ -56,7 +56,7 @@
  * @package Piwik
  * @subpackage ViewDataTable
  */
-abstract class ViewDataTable
+class ViewDataTable
 {
     /**
      * TODO
@@ -137,8 +137,10 @@ abstract class ViewDataTable
     /**
      * Default constructor.
      */
-    public function __construct()
+    public function __construct($visualization = null)
     {
+        $this->visualization = $visualization;
+
         $this->viewProperties['visualization_properties'] = new VisualizationPropertiesProxy(null);
         $this->viewProperties['datatable_template'] = '@CoreHome/_dataTable';
         $this->viewProperties['show_goals'] = false;
@@ -255,7 +257,13 @@ public function main()
      *
      * @return string
      */
-    abstract protected function getViewDataTableId();
+    protected function getViewDataTableId()
+    {
+        if (method_exists($this->visualization, 'getViewDataTableId')) {
+            return $this->visualization->getViewDataTableId();
+        }
+        return false;
+    }
 
     /**
      * Returns a Piwik_ViewDataTable_* object.
@@ -318,7 +326,7 @@ static public function factory($defaultType = null, $apiAction = false, $control
 
             case 'table':
             default:
-                $result = new ViewDataTable\HtmlTable();
+                $result = new ViewDataTable(new Visualization\HtmlTable());
                 break;
         }
 
@@ -372,7 +380,7 @@ public function getOverridableProperties()
      */
     public function getJavaScriptProperties()
     {
-        return array(
+        $result = array(
             'enable_sort',
             'disable_generic_filters',
             'disable_queued_filters',
@@ -385,6 +393,12 @@ public function getJavaScriptProperties()
             'filter_sort_column',
             'filter_sort_order',
         );
+
+        if (method_exists($this->visualization, 'getJavaScriptProperties')) {
+            $result = array_merge($result, $this->visualization->getJavaScriptProperties());
+        }
+
+        return $result;
     }
 
     /**
@@ -622,6 +636,8 @@ protected function checkStandardDataTable()
      */
     protected function postDataTableLoadedFromAPI()
     {
+        $this->overrideViewProperties();
+
         if (empty($this->dataTable)) {
             return false;
         }
@@ -1206,8 +1222,6 @@ protected function buildView($visualization)
             $this->setPropertyDefaults($visualization->getDefaultPropertyValues());
         }
 
-        $this->overrideViewProperties();
-
         $template = $this->viewProperties['datatable_template'];
         $view = new View($template);
 
@@ -1234,11 +1248,12 @@ protected function buildView($visualization)
 
     public function getDefaultDataTableCssClass()
     {
-        return false;
+        $parts = explode('\\', get_class($this->visualization));
+        return 'dataTableViz' . end($parts);
     }
 
     /**
-     * TODO
+     * Sets view properties if they have not been set already.
      */
     private function setPropertyDefaults($defaultValues)
     {

diff --git a/core/ViewDataTable/HtmlTable.php b/core/ViewDataTable/HtmlTable.php
@@ -35,20 +35,4 @@ public function __construct()
 
         $this->visualization = new Visualization\HtmlTable();
     }
-
-    public function getJavaScriptProperties()
-    {
-        return array_merge(parent::getJavaScriptProperties(), $this->visualization->getJavaScriptProperties());
-    }
-
-    protected function getViewDataTableId()
-    {
-        return $this->visualization->getViewDataTableId();
-    }
-
-    public function getDefaultDataTableCssClass()
-    {
-        $parts = explode('\\', get_class($this));
-        return 'dataTableViz' . end($parts);
-    }
 }