Skip to content
Extraits de code Groupes Projets
Valider f6d87baf rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

refs #5192 simplified admin menu since it is very confusing for developers to... 

refs #5192 simplified admin menu since it is very confusing for developers to find the correct translation key to use for menuName. Results in lots of dulicated code as well (same translation keys are mentioned everywhere). Also removed the $displayedForCurrentUsers in those methods since boolean parameters are bad practice and it did result in duplicated code as well as you had to call the same function or pass the same variable in each add() call. Moved the VisitorGenerator in a development section since it is not really diagnostic. There will be another development menu item with the next commit. Need to update ui tests
parent 2949359c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 145 ajouts et 68 suppressions
core/Menu/MenuAdmin.php
+ 65
− 0
Voir le fichier @ f6d87baf
...@@ -48,6 +48,71 @@ class MenuAdmin extends MenuAbstract ...@@ -48,6 +48,71 @@ class MenuAdmin extends MenuAbstract
self::getInstance()->add('General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order); self::getInstance()->add('General_Settings', $adminMenuName, $url, $displayedForCurrentUser, $order);
} }
/**
* See {@link add()}. Adds a new menu item to the development section.
* @param string $menuName
* @param array $url
* @param int $order
* @param bool $tooltip
* @api
*/
public function addDevelopmentItem($menuName, $url, $order = 50, $tooltip = false)
{
$this->add('CoreAdminHome_MenuDevelopment', $menuName, $url, true, $order, $tooltip);
}
/**
* See {@link add()}. Adds a new menu item to the development section.
* @param string $menuName
* @param array $url
* @param int $order
* @param bool $tooltip
* @api
*/
public function addDiagnosticItem($menuName, $url, $order = 50, $tooltip = false)
{
$this->add('CoreAdminHome_MenuDiagnostic', $menuName, $url, true, $order, $tooltip);
}
/**
* See {@link add()}. Adds a new menu item to the development section.
* @param string $menuName
* @param array $url
* @param int $order
* @param bool $tooltip
* @api
*/
public function addPlatformItem($menuName, $url, $order = 50, $tooltip = false)
{
$this->add('CorePluginsAdmin_MenuPlatform', $menuName, $url, true, $order, $tooltip);
}
/**
* See {@link add()}. Adds a new menu item to the development section.
* @param string $menuName
* @param array $url
* @param int $order
* @param bool $tooltip
* @api
*/
public function addSettingsItem($menuName, $url, $order = 50, $tooltip = false)
{
$this->add('General_Settings', $menuName, $url, true, $order, $tooltip);
}
/**
* See {@link add()}. Adds a new menu item to the development section.
* @param string $menuName
* @param array $url
* @param int $order
* @param bool $tooltip
* @api
*/
public function addManageItem($menuName, $url, $order = 50, $tooltip = false)
{
$this->add('CoreAdminHome_MenuManage', $menuName, $url, true, $order, $tooltip);
}
/** /**
* Triggers the Menu.MenuAdmin.addItems hook and returns the admin menu. * Triggers the Menu.MenuAdmin.addItems hook and returns the admin menu.
* *
......
plugins/CoreAdminHome/Menu.php
+ 19
− 15
Voir le fichier @ f6d87baf
...@@ -20,21 +20,25 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -20,21 +20,25 @@ class Menu extends \Piwik\Plugin\Menu
{ {
$hasAdminAccess = Piwik::isUserHasSomeAdminAccess(); $hasAdminAccess = Piwik::isUserHasSomeAdminAccess();
$menu->add('CoreAdminHome_MenuManage', null, "", $hasAdminAccess, $order = 1); if ($hasAdminAccess) {
$menu->add('CoreAdminHome_MenuDiagnostic', null, "", $hasAdminAccess, $order = 10); $menu->addManageItem(null, "", $order = 1);
$menu->add('General_Settings', null, "", $hasAdminAccess, $order = 5); $menu->addSettingsItem(null, "", $order = 5);
$menu->add('General_Settings', 'CoreAdminHome_MenuGeneralSettings', $menu->addDiagnosticItem(null, "", $order = 10);
array('module' => 'CoreAdminHome', 'action' => 'generalSettings'), $menu->addDevelopmentItem(null, "", $order = 15);
$hasAdminAccess,
$order = 6); $menu->addSettingsItem('CoreAdminHome_MenuGeneralSettings',
$menu->add('CoreAdminHome_MenuManage', 'CoreAdminHome_TrackingCode', array('module' => 'CoreAdminHome', 'action' => 'generalSettings'),
array('module' => 'CoreAdminHome', 'action' => 'trackingCodeGenerator'), $order = 6);
$hasAdminAccess, $menu->addManageItem('CoreAdminHome_TrackingCode',
$order = 4); array('module' => 'CoreAdminHome', 'action' => 'trackingCodeGenerator'),
$menu->add('General_Settings', 'CoreAdminHome_PluginSettings', $order = 4);
array('module' => 'CoreAdminHome', 'action' => 'pluginSettings'), }
SettingsManager::hasPluginsSettingsForCurrentUser(),
$order = 7); if (SettingsManager::hasPluginsSettingsForCurrentUser()) {
$menu->addSettingsItem('CoreAdminHome_PluginSettings',
array('module' => 'CoreAdminHome', 'action' => 'pluginSettings'),
$order = 7);
}
} }
} }
plugins/CorePluginsAdmin/Menu.php
+ 17
− 15
Voir le fichier @ f6d87baf
...@@ -39,21 +39,23 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -39,21 +39,23 @@ class Menu extends \Piwik\Plugin\Menu
} }
} }
$menu->add('CorePluginsAdmin_MenuPlatform', null, "", !$isAnonymous, $order = 7); if (!$isAnonymous) {
$menu->add('CorePluginsAdmin_MenuPlatform', Piwik::translate('General_Plugins') . $pluginsUpdateMessage, $menu->addPlatformItem(null, "", $order = 7);
array('module' => 'CorePluginsAdmin', 'action' => 'plugins', 'activated' => ''), }
$hasSuperUserAcess,
$order = 1); if ($hasSuperUserAcess) {
$menu->add('CorePluginsAdmin_MenuPlatform', Piwik::translate('CorePluginsAdmin_Themes') . $themesUpdateMessage, $menu->addPlatformItem(Piwik::translate('General_Plugins') . $pluginsUpdateMessage,
array('module' => 'CorePluginsAdmin', 'action' => 'themes', 'activated' => ''), array('module' => 'CorePluginsAdmin', 'action' => 'plugins', 'activated' => ''),
$hasSuperUserAcess, $order = 1);
$order = 3); $menu->addPlatformItem(Piwik::translate('CorePluginsAdmin_Themes') . $themesUpdateMessage,
array('module' => 'CorePluginsAdmin', 'action' => 'themes', 'activated' => ''),
if ($isMarketplaceEnabled) { $order = 3);
$menu->add('CorePluginsAdmin_MenuPlatform', 'CorePluginsAdmin_Marketplace', }
array('module' => 'CorePluginsAdmin', 'action' => 'extend', 'activated' => ''),
!$isAnonymous, if ($isMarketplaceEnabled && !$isAnonymous) {
$order = 5); $menu->addPlatformItem('CorePluginsAdmin_Marketplace',
array('module' => 'CorePluginsAdmin', 'action' => 'extend', 'activated' => ''),
$order = 5);
} }
} }
......
plugins/DBStats/Menu.php
+ 5
− 4
Voir le fichier @ f6d87baf
...@@ -17,9 +17,10 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -17,9 +17,10 @@ class Menu extends \Piwik\Plugin\Menu
{ {
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
$menu->add('CoreAdminHome_MenuDiagnostic', 'DBStats_DatabaseUsage', if (Piwik::hasUserSuperUserAccess()) {
array('module' => 'DBStats', 'action' => 'index'), $menu->addDiagnosticItem('DBStats_DatabaseUsage',
Piwik::hasUserSuperUserAccess(), array('module' => 'DBStats', 'action' => 'index'),
$order = 6); $order = 6);
}
} }
} }
plugins/DevicesDetection/Menu.php
+ 5
− 6
Voir le fichier @ f6d87baf
...@@ -18,12 +18,11 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -18,12 +18,11 @@ class Menu extends \Piwik\Plugin\Menu
{ {
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
$menu->add( if (Piwik::isUserHasSomeAdminAccess()) {
'CoreAdminHome_MenuDiagnostic', 'DevicesDetection_DeviceDetection', $menu->addDiagnosticItem('DevicesDetection_DeviceDetection',
array('module' => 'DevicesDetection', 'action' => 'deviceDetection'), array('module' => 'DevicesDetection', 'action' => 'deviceDetection'),
Piwik::isUserHasSomeAdminAccess(), $order = 40);
$order = 40 }
);
} }
public function configureReportingMenu(MenuReporting $menu) public function configureReportingMenu(MenuReporting $menu)
......
plugins/ExamplePlugin/Menu.php
+ 6
− 0
Voir le fichier @ f6d87baf
...@@ -29,6 +29,12 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -29,6 +29,12 @@ class Menu extends \Piwik\Plugin\Menu
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
// $menu->add('General_Settings', 'My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), true, $orderId = 30); // $menu->add('General_Settings', 'My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), true, $orderId = 30);
// or
// $menu->addSettingsItem('My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30);
// $menu->addManageItem('My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30);
// $menu->addPlatformItem('My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30);
// $menu->addDiagnosticItem('My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30);
// $menu->addDevelopmentItem('My Admin Item', array('module' => 'ExamplePlugin', 'action' => ''), $orderId = 30);
} }
public function configureTopMenu(MenuTop $menu) public function configureTopMenu(MenuTop $menu)
......
plugins/Installation/Menu.php
+ 5
− 4
Voir le fichier @ f6d87baf
...@@ -15,9 +15,10 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -15,9 +15,10 @@ class Menu extends \Piwik\Plugin\Menu
{ {
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
$menu->add('General_Settings', 'Installation_SystemCheck', if (Piwik::hasUserSuperUserAccess()) {
array('module' => 'Installation', 'action' => 'systemCheckPage'), $menu->addSettingsItem('Installation_SystemCheck',
Piwik::hasUserSuperUserAccess(), array('module' => 'Installation', 'action' => 'systemCheckPage'),
$order = 15); $order = 15);
}
} }
} }
plugins/MobileMessaging/Menu.php
+ 1
− 3
Voir le fichier @ f6d87baf
...@@ -14,11 +14,9 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -14,11 +14,9 @@ class Menu extends \Piwik\Plugin\Menu
{ {
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
$menu->add( $menu->addSettingsItem(
'General_Settings',
'MobileMessaging_SettingsMenu', 'MobileMessaging_SettingsMenu',
array('module' => 'MobileMessaging', 'action' => 'index'), array('module' => 'MobileMessaging', 'action' => 'index'),
true,
$order = 12 $order = 12
); );
} }
......
plugins/PrivacyManager/Menu.php
+ 5
− 4
Voir le fichier @ f6d87baf
...@@ -15,9 +15,10 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -15,9 +15,10 @@ class Menu extends \Piwik\Plugin\Menu
{ {
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
$menu->add('General_Settings', 'PrivacyManager_MenuPrivacySettings', if (Piwik::isUserHasSomeAdminAccess()) {
array('module' => 'PrivacyManager', 'action' => 'privacySettings'), $menu->addSettingsItem('PrivacyManager_MenuPrivacySettings',
Piwik::isUserHasSomeAdminAccess(), array('module' => 'PrivacyManager', 'action' => 'privacySettings'),
$order = 7); $order = 7);
}
} }
} }
plugins/SitesManager/Menu.php
+ 5
− 4
Voir le fichier @ f6d87baf
...@@ -15,9 +15,10 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -15,9 +15,10 @@ class Menu extends \Piwik\Plugin\Menu
{ {
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
$menu->add('CoreAdminHome_MenuManage', 'SitesManager_Sites', if (Piwik::isUserHasSomeAdminAccess()) {
array('module' => 'SitesManager', 'action' => 'index'), $menu->addManageItem('SitesManager_Sites',
Piwik::isUserHasSomeAdminAccess(), array('module' => 'SitesManager', 'action' => 'index'),
$order = 1); $order = 1);
}
} }
} }
plugins/UserCountry/Menu.php
+ 4
− 5
Voir le fichier @ f6d87baf
...@@ -16,11 +16,10 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -16,11 +16,10 @@ class Menu extends \Piwik\Plugin\Menu
{ {
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
if (UserCountry::isGeoLocationAdminEnabled()) { if (UserCountry::isGeoLocationAdminEnabled() && Piwik::hasUserSuperUserAccess()) {
$menu->add('General_Settings', 'UserCountry_Geolocation', $menu->addSettingsItem('UserCountry_Geolocation',
array('module' => 'UserCountry', 'action' => 'adminIndex'), array('module' => 'UserCountry', 'action' => 'adminIndex'),
Piwik::hasUserSuperUserAccess(), $order = 8);
$order = 8);
} }
} }
......
plugins/UsersManager/Menu.php
+ 8
− 8
Voir le fichier @ f6d87baf
...@@ -15,13 +15,13 @@ class Menu extends \Piwik\Plugin\Menu ...@@ -15,13 +15,13 @@ class Menu extends \Piwik\Plugin\Menu
{ {
public function configureAdminMenu(MenuAdmin $menu) public function configureAdminMenu(MenuAdmin $menu)
{ {
$menu->add('CoreAdminHome_MenuManage', 'UsersManager_MenuUsers', if (Piwik::isUserHasSomeAdminAccess()) {
array('module' => 'UsersManager', 'action' => 'index'), $menu->addManageItem('UsersManager_MenuUsers',
Piwik::isUserHasSomeAdminAccess(), array('module' => 'UsersManager', 'action' => 'index'),
$order = 2); $order = 2);
$menu->add('CoreAdminHome_MenuManage', 'UsersManager_MenuUserSettings', $menu->addManageItem('UsersManager_MenuUserSettings',
array('module' => 'UsersManager', 'action' => 'userSettings'), array('module' => 'UsersManager', 'action' => 'userSettings'),
Piwik::isUserHasSomeViewAccess(), $order = 3);
$order = 3); }
} }
} }
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter