Refs #4041, #4040, moved viewdatatable cloud logic to cloud visualiza…

…tion. Removed cloud viewdatatable.
matomo-org · Aug 4, 2013 · cf8d0a5 · cf8d0a5
1 parent ac3a25c
commit cf8d0a5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 82 deletions.
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
@@ -288,7 +288,7 @@ static public function factory($defaultType = null, $apiAction = false, $control
         $type = Common::getRequestVar('viewDataTable', $defaultType, 'string');
         switch ($type) {
             case 'cloud':
-                $result = new ViewDataTable\Cloud();
+                $result = new ViewDataTable('\\Piwik\\Visualization\\JqplotGraph\\Cloud');
                 break;
 
             case 'graphPie':

diff --git a/core/ViewDataTable/Cloud.php b/core/ViewDataTable/Cloud.php
diff --git a/core/Visualization/Cloud.php b/core/Visualization/Cloud.php
@@ -26,12 +26,28 @@
  */
 class Cloud extends DataTableVisualization
 {
+    const ID = 'cloud';
+
     /** Used by integration tests to make sure output is consistent. */
     public static $debugDisableShuffle = false;
 
     protected $wordsArray = array();
     public $truncatingLimit = 50;
 
+    public function __construct($view)
+    {
+        $view->defaultPropertiesTo($this->getDefaultPropertyValues());
+    }
+
+    public static function getDefaultPropertyValues()
+    {
+        return array(
+            'show_offset_information' => false,
+            'show_exclude_low_population' => false,
+            'display_logo_instead_of_label' => false,
+        );
+    }
+
     /**
      * Assign word to array
      * @param string $word