diff options
| -rw-r--r-- | core/Plugin/Controller.php | 2 | ||||
| -rw-r--r-- | plugins/ExampleUI/Controller.php | 2 | ||||
| -rw-r--r-- | plugins/Referrers/Controller.php | 16 | ||||
| -rw-r--r-- | plugins/UserCountry/Controller.php | 2 | ||||
| -rw-r--r-- | plugins/VisitsSummary/Controller.php | 1 |
5 files changed, 12 insertions, 11 deletions
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php index 156d490a6a..6c03db4363 100644 --- a/core/Plugin/Controller.php +++ b/core/Plugin/Controller.php @@ -181,7 +181,7 @@ abstract class Controller { $view = ViewDataTableBuilder::factory( 'graphEvolution', $apiMethod, $currentModuleName . '.' . $currentControllerAction, $forceDefault = true); - $view->show_goals = false; + $view->config->show_goals = false; return $view; } diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php index d8194f2fc9..46d2627a3c 100644 --- a/plugins/ExampleUI/Controller.php +++ b/plugins/ExampleUI/Controller.php @@ -52,7 +52,7 @@ class Controller extends \Piwik\Plugin\Controller $view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, __FUNCTION__, $columns, $selectableColumns = array('server1', 'server2'), 'My documentation', 'ExampleUI.getTemperaturesEvolution'); - $view->filter_sort_column = 'label'; + $view->requestConfig->filter_sort_column = 'label'; return $this->renderView($view, $fetch); } diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php index faecee7954..bf15aa9f74 100644 --- a/plugins/Referrers/Controller.php +++ b/plugins/Referrers/Controller.php @@ -315,32 +315,32 @@ class Controller extends \Piwik\Plugin\Controller public function getLastDistinctSearchEnginesGraph($fetch = false) { $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctSearchEngines"); - $view->translations['Referrers_distinctSearchEngines'] = ucfirst(Piwik::translate('Referrers_DistinctSearchEngines')); - $view->columns_to_display = array('Referrers_distinctSearchEngines'); + $view->config->translations['Referrers_distinctSearchEngines'] = ucfirst(Piwik::translate('Referrers_DistinctSearchEngines')); + $view->config->columns_to_display = array('Referrers_distinctSearchEngines'); return $this->renderView($view, $fetch); } public function getLastDistinctKeywordsGraph($fetch = false) { $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctKeywords"); - $view->translations['Referrers_distinctKeywords'] = ucfirst(Piwik::translate('Referrers_DistinctKeywords')); - $view->columns_to_display = array('Referrers_distinctKeywords'); + $view->config->translations['Referrers_distinctKeywords'] = ucfirst(Piwik::translate('Referrers_DistinctKeywords')); + $view->config->columns_to_display = array('Referrers_distinctKeywords'); return $this->renderView($view, $fetch); } public function getLastDistinctWebsitesGraph($fetch = false) { $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctWebsites"); - $view->translations['Referrers_distinctWebsites'] = ucfirst(Piwik::translate('Referrers_DistinctWebsites')); - $view->columns_to_display = array('Referrers_distinctWebsites'); + $view->config->translations['Referrers_distinctWebsites'] = ucfirst(Piwik::translate('Referrers_DistinctWebsites')); + $view->config->columns_to_display = array('Referrers_distinctWebsites'); return $this->renderView($view, $fetch); } public function getLastDistinctCampaignsGraph($fetch = false) { $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referrers.getNumberOfDistinctCampaigns"); - $view->translations['Referrers_distinctCampaigns'] = ucfirst(Piwik::translate('Referrers_DistinctCampaigns')); - $view->columns_to_display = array('Referrers_distinctCampaigns'); + $view->config->translations['Referrers_distinctCampaigns'] = ucfirst(Piwik::translate('Referrers_DistinctCampaigns')); + $view->config->columns_to_display = array('Referrers_distinctCampaigns'); return $this->renderView($view, $fetch); } diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index b207bc2497..7390c8d687 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -365,7 +365,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin public function getLastDistinctCountriesGraph($fetch = false) { $view = $this->getLastUnitGraph('UserCountry', __FUNCTION__, "UserCountry.getNumberOfDistinctCountries"); - $view->columns_to_display = array('UserCountry_distinctCountries'); + $view->config->columns_to_display = array('UserCountry_distinctCountries'); return $this->renderView($view, $fetch); } diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index ca9aaa7df9..27c249f7a9 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -91,6 +91,7 @@ class Controller extends \Piwik\Plugin\Controller $selectableColumns[] = 'nb_searches'; $selectableColumns[] = 'nb_keywords'; } + $view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, __FUNCTION__, $columns, $selectableColumns, $documentation); |