From e3677583a96ac5e87f5a22ef8685f7c36cf80c88 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Tue, 12 Apr 2016 16:02:13 +1200 Subject: fix tests (#10040) --- plugins/API/ProcessedReport.php | 2 -- plugins/Actions/Reports/GetEntryPageTitles.php | 2 ++ plugins/Actions/Reports/GetExitPageTitles.php | 3 ++- plugins/CoreAdminHome/Menu.php | 4 ++-- plugins/CorePluginsAdmin/Menu.php | 2 +- plugins/CustomAlerts | 2 +- plugins/CustomDimensions | 2 +- plugins/Goals/Goals.php | 7 ++++++- plugins/Goals/Menu.php | 2 +- plugins/MobileMessaging/Menu.php | 2 +- plugins/PrivacyManager/Menu.php | 2 +- plugins/SitesManager/Menu.php | 2 +- plugins/UserCountry/Menu.php | 2 +- plugins/UsersManager/Menu.php | 4 ++-- 14 files changed, 22 insertions(+), 16 deletions(-) (limited to 'plugins') diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index f5c5cc1a91..12b02bbe4c 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -22,12 +22,10 @@ use Piwik\Metrics; use Piwik\Metrics\Formatter; use Piwik\Period; use Piwik\Piwik; -use Piwik\Plugin\Report; use Piwik\Plugin\ReportsProvider; use Piwik\Site; use Piwik\Timer; use Piwik\Url; -use Piwik\Category\Category; class ProcessedReport { diff --git a/plugins/Actions/Reports/GetEntryPageTitles.php b/plugins/Actions/Reports/GetEntryPageTitles.php index 5f81112116..6316983984 100644 --- a/plugins/Actions/Reports/GetEntryPageTitles.php +++ b/plugins/Actions/Reports/GetEntryPageTitles.php @@ -38,6 +38,8 @@ class GetEntryPageTitles extends Base ); $this->order = 6; $this->actionToLoadSubTables = $this->action; + + $this->subcategoryId = 'Actions_SubmenuPagesEntry'; } public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory) diff --git a/plugins/Actions/Reports/GetExitPageTitles.php b/plugins/Actions/Reports/GetExitPageTitles.php index 74ceaf6b17..1a61166170 100644 --- a/plugins/Actions/Reports/GetExitPageTitles.php +++ b/plugins/Actions/Reports/GetExitPageTitles.php @@ -29,6 +29,7 @@ class GetExitPageTitles extends Base $this->name = Piwik::translate('Actions_ExitPageTitles'); $this->documentation = Piwik::translate('Actions_ExitPageTitlesReportDocumentation', '
') . ' ' . Piwik::translate('General_UsePlusMinusIconsDocumentation'); + $this->subcategoryId = 'Actions_SubmenuPagesExit'; $this->metrics = array('exit_nb_visits', 'nb_visits'); $this->processedMetrics = array( @@ -37,7 +38,7 @@ class GetExitPageTitles extends Base new ExitRate(), new AveragePageGenerationTime() ); - $this->order = 7; + $this->order = 7; $this->actionToLoadSubTables = $this->action; } diff --git a/plugins/CoreAdminHome/Menu.php b/plugins/CoreAdminHome/Menu.php index 9dcb9b9e66..17d0d40910 100644 --- a/plugins/CoreAdminHome/Menu.php +++ b/plugins/CoreAdminHome/Menu.php @@ -25,13 +25,13 @@ class Menu extends \Piwik\Plugin\Menu if (Piwik::hasUserSuperUserAccess()) { $menu->addManageItem('General_GeneralSettings', $this->urlForAction('generalSettings'), - $order = 6); + $order = 5); } if (!Piwik::isUserIsAnonymous()) { $menu->addManageItem('CoreAdminHome_TrackingCode', $this->urlForAction('trackingCodeGenerator'), - $order = 25); + $order = 11); } } diff --git a/plugins/CorePluginsAdmin/Menu.php b/plugins/CorePluginsAdmin/Menu.php index 8095870ac8..7ad8af935e 100644 --- a/plugins/CorePluginsAdmin/Menu.php +++ b/plugins/CorePluginsAdmin/Menu.php @@ -42,7 +42,7 @@ class Menu extends \Piwik\Plugin\Menu if ($hasSuperUserAcess) { $menu->addManageItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage, $this->urlForAction('plugins', array('activated' => '')), - $order = 4); + $order = 20); } if ($this->isAllowedToSeeMarketPlace()) { diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts index 2e9e51c2ae..97f33b2fd9 160000 --- a/plugins/CustomAlerts +++ b/plugins/CustomAlerts @@ -1 +1 @@ -Subproject commit 2e9e51c2aebf2bb531958ddfa3f614b66a0b9a7e +Subproject commit 97f33b2fd90c766f37904c2e433c8a4beeda8bc8 diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions index 072bd2b3d9..10920d1414 160000 --- a/plugins/CustomDimensions +++ b/plugins/CustomDimensions @@ -1 +1 @@ -Subproject commit 072bd2b3d901c0dc45b43683dd3385686d61900a +Subproject commit 10920d1414254a9fceaf2cfb3a3cfa46b29dc1ba diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php index 1f9d229428..ae9ea61cda 100644 --- a/plugins/Goals/Goals.php +++ b/plugins/Goals/Goals.php @@ -90,7 +90,12 @@ class Goals extends \Piwik\Plugin $idSite = Common::getRequestVar('idSite', 0, 'int'); if (!$idSite) { - return; + // fallback for eg API.getReportMetadata which uses idSites + $idSite = Common::getRequestVar('idSites', 0, 'int'); + + if (!$idSite) { + return; + } } $goals = API::getInstance()->getGoals($idSite); diff --git a/plugins/Goals/Menu.php b/plugins/Goals/Menu.php index 4d5f60a937..542eba461b 100644 --- a/plugins/Goals/Menu.php +++ b/plugins/Goals/Menu.php @@ -21,7 +21,7 @@ class Menu extends \Piwik\Plugin\Menu $idSite = $this->getIdSite($userPreferences->getDefaultWebsiteId()); if (Piwik::isUserHasAdminAccess($idSite)) { - $menu->addManageItem('Goals_Goals', $this->urlForAction('manage', array('idSite' => $idSite)), 15); + $menu->addManageItem('Goals_Goals', $this->urlForAction('manage', array('idSite' => $idSite)), 40); } } diff --git a/plugins/MobileMessaging/Menu.php b/plugins/MobileMessaging/Menu.php index 503f143cb4..3c12293ac3 100644 --- a/plugins/MobileMessaging/Menu.php +++ b/plugins/MobileMessaging/Menu.php @@ -16,7 +16,7 @@ class Menu extends \Piwik\Plugin\Menu public function configureAdminMenu(MenuAdmin $menu) { if (Piwik::hasUserSuperUserAccess()) { - $menu->addManageItem('MobileMessaging_SettingsMenu', $this->urlForAction('index'), $order = 12); + $menu->addManageItem('MobileMessaging_SettingsMenu', $this->urlForAction('index'), $order = 35); } if (!Piwik::isUserIsAnonymous()) { diff --git a/plugins/PrivacyManager/Menu.php b/plugins/PrivacyManager/Menu.php index 1e3523f1da..f84bdf66dc 100644 --- a/plugins/PrivacyManager/Menu.php +++ b/plugins/PrivacyManager/Menu.php @@ -18,7 +18,7 @@ class Menu extends \Piwik\Plugin\Menu if (Piwik::isUserHasSomeAdminAccess()) { $menu->addManageItem('PrivacyManager_MenuPrivacySettings', $this->urlForAction('privacySettings'), - $order = 9); + $order = 25); } } } diff --git a/plugins/SitesManager/Menu.php b/plugins/SitesManager/Menu.php index d242a25351..aac879955b 100644 --- a/plugins/SitesManager/Menu.php +++ b/plugins/SitesManager/Menu.php @@ -33,7 +33,7 @@ class Menu extends \Piwik\Plugin\Menu $menu->addManageItem($menuName, $this->urlForAction('index'), - $order = 1); + $order = 10); } } diff --git a/plugins/UserCountry/Menu.php b/plugins/UserCountry/Menu.php index 48a6b21980..0bdc6602ac 100644 --- a/plugins/UserCountry/Menu.php +++ b/plugins/UserCountry/Menu.php @@ -18,7 +18,7 @@ class Menu extends \Piwik\Plugin\Menu if (UserCountry::isGeoLocationAdminEnabled() && Piwik::hasUserSuperUserAccess()) { $menu->addManageItem('UserCountry_Geolocation', $this->urlForAction('adminIndex'), - $order = 9); + $order = 30); } } } diff --git a/plugins/UsersManager/Menu.php b/plugins/UsersManager/Menu.php index 277d96f63c..c95506dca3 100644 --- a/plugins/UsersManager/Menu.php +++ b/plugins/UsersManager/Menu.php @@ -16,11 +16,11 @@ class Menu extends \Piwik\Plugin\Menu public function configureAdminMenu(MenuAdmin $menu) { if (Piwik::isUserHasSomeAdminAccess()) { - $menu->addManageItem('UsersManager_MenuUsers', $this->urlForAction('index'), $order = 2); + $menu->addManageItem('UsersManager_MenuUsers', $this->urlForAction('index'), $order = 15); } if (Piwik::hasUserSuperUserAccess() && API::getInstance()->getSitesAccessFromUser('anonymous')) { - $menu->addManageItem('UsersManager_AnonymousUser', $this->urlForAction('anonymousSettings'), $order = 20); + $menu->addManageItem('UsersManager_AnonymousUser', $this->urlForAction('anonymousSettings'), $order = 16); } if (!Piwik::isUserIsAnonymous()) { -- cgit v1.2.3