diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-10-21 05:45:28 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-10-21 05:45:28 +0400 |
commit | f2adaf4c8da19e6b617c9430a0c2a731353b7e60 (patch) | |
tree | 2b90e866c770bc8eae2795947ee1181eafda27d1 /plugins/Actions | |
parent | 15a4fc8bacc4d7091e2a3f23c036ce1bcba89116 (diff) | |
parent | 0cee5b820a441bd60b7cf3853a3f785f0a5ed669 (diff) |
Merge remote-tracking branch 'origin/master' into cevents
Diffstat (limited to 'plugins/Actions')
-rw-r--r-- | plugins/Actions/Actions.php | 4 | ||||
-rw-r--r-- | plugins/Actions/Controller.php | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index cd981cbcfc..3d4cddd388 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -707,7 +707,7 @@ class Actions extends \Piwik\Plugin $view->config->search_recursive = true; $view->config->show_table_all_columns = false; $view->requestConfig->filter_limit = self::ACTIONS_REPORT_ROWS_DISPLAY; - $view->config->show_all_views_icons = false; + $view->config->show_all_views_icons = false; if ($view->isViewDataTableId(HtmlTable::ID)) { $view->config->show_embedded_subtable = true; @@ -717,7 +717,7 @@ class Actions extends \Piwik\Plugin // so users can see that they can set it to 1 (see #3365) $view->config->custom_parameters = array('flat' => 0); - if (ViewDataTableRequest::shouldLoadExpanded()) { + if (Request::shouldLoadExpanded()) { if ($view->isViewDataTableId(HtmlTable::ID)) { $view->config->show_expanded = true; diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index e1c67690e8..866b030d6d 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -12,7 +12,7 @@ namespace Piwik\Plugins\Actions; use Piwik\Piwik; use Piwik\View; -use Piwik\ViewDataTable; +use Piwik\ViewDataTable\Factory; /** * Actions controller @@ -89,66 +89,66 @@ class Controller extends \Piwik\Plugin\Controller public function getPageUrls($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getEntryPageUrls($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getExitPageUrls($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getSiteSearchKeywords($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getSiteSearchNoResultKeywords($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getSiteSearchCategories($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getPageUrlsFollowingSiteSearch($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getPageTitlesFollowingSiteSearch($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getPageTitles($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getEntryPageTitles($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getExitPageTitles($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getDownloads($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } public function getOutlinks($fetch = false) { - return ViewDataTable::renderReport($this->pluginName, __FUNCTION__, $fetch); + return Factory::renderReport($this->pluginName, __FUNCTION__, $fetch); } } |