diff --git a/core/modules/menu_link/config/schema/menu_link.schema.yml b/core/modules/menu_link/config/schema/menu_link.schema.yml new file mode 100644 index 0000000..2fddb84 --- /dev/null +++ b/core/modules/menu_link/config/schema/menu_link.schema.yml @@ -0,0 +1,26 @@ +field.field_settings.menu_link: + type: mapping + label: 'Menu link settings' + mapping: + available_menus: + type: sequence + label: 'Available menus' + sequence: + - type: string + parent: + type: string + label: 'Parent' + +field.value.menu_link: + type: mapping + label: 'Default value' + mapping: + menu_name: + type: string + label: 'Value' + parent: + type: string + label: 'Text format' + weight: + type: integer + label: 'Weight' \ No newline at end of file diff --git a/core/modules/menu_ui/src/MenuForm.php b/core/modules/menu_ui/src/MenuForm.php index 7b540af..1ad5271 100644 --- a/core/modules/menu_ui/src/MenuForm.php +++ b/core/modules/menu_ui/src/MenuForm.php @@ -224,7 +224,6 @@ protected function buildOverviewForm(array &$form, FormStateInterface $form_stat // We indicate that a menu administrator is running the menu access check. $this->getRequest()->attributes->set('_menu_admin', TRUE); $manipulators = array( - array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'), array('callable' => 'menu.default_tree_manipulators:checkAccess'), array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'), ); diff --git a/core/modules/system/src/Controller/SystemController.php b/core/modules/system/src/Controller/SystemController.php index 9e976c5..22bade6 100644 --- a/core/modules/system/src/Controller/SystemController.php +++ b/core/modules/system/src/Controller/SystemController.php @@ -124,7 +124,6 @@ public function overview($link_id) { $parameters->setRoot($link_id)->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $this->menuLinkTree->load(NULL, $parameters); $manipulators = array( - array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'), array('callable' => 'menu.default_tree_manipulators:checkAccess'), array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'), ); diff --git a/core/modules/system/src/Plugin/Block/SystemMenuBlock.php b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php index 93d1dfa..16af329 100644 --- a/core/modules/system/src/Plugin/Block/SystemMenuBlock.php +++ b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php @@ -146,7 +146,6 @@ public function build() { $tree = $this->menuTree->load($menu_name, $parameters); $manipulators = array( - array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'), array('callable' => 'menu.default_tree_manipulators:checkAccess'), array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'), ); diff --git a/core/modules/system/src/SystemManager.php b/core/modules/system/src/SystemManager.php index d5fae71..11c3efc 100644 --- a/core/modules/system/src/SystemManager.php +++ b/core/modules/system/src/SystemManager.php @@ -195,7 +195,6 @@ public function getAdminBlock(MenuLinkInterface $instance) { $parameters->setRoot($link_id)->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $this->menuTree->load(NULL, $parameters); $manipulators = array( - array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'), array('callable' => 'menu.default_tree_manipulators:checkAccess'), array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'), ); diff --git a/core/modules/system/src/Tests/System/AdminTest.php b/core/modules/system/src/Tests/System/AdminTest.php index 83048a0..fee3cd9 100644 --- a/core/modules/system/src/Tests/System/AdminTest.php +++ b/core/modules/system/src/Tests/System/AdminTest.php @@ -131,7 +131,6 @@ protected function getTopLevelMenuLinks() { $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $menu_tree->load(NULL, $parameters); $manipulators = array( - array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'), array('callable' => 'menu.default_tree_manipulators:checkAccess'), array('callable' => 'menu.default_tree_manipulators:flatten'), ); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 001f96f..8f2a8ab 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1124,7 +1124,6 @@ function system_get_module_admin_tasks($module, array $info) { $parameters->setRoot('system.admin')->excludeRoot()->onlyEnabledLinks(); $tree = $menu_tree->load('system.admin', $parameters); $manipulators = array( - array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'), array('callable' => 'menu.default_tree_manipulators:checkAccess'), array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'), array('callable' => 'menu.default_tree_manipulators:flatten'), diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index 0e7a35b..7b75e89 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -210,7 +210,6 @@ function toolbar_prerender_toolbar_administration_tray(array $element) { $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks(); $tree = $menu_tree->load(NULL, $parameters); $manipulators = array( - array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'), array('callable' => 'menu.default_tree_manipulators:checkAccess'), array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'), array('callable' => 'toolbar_menu_navigation_links'), @@ -267,8 +266,6 @@ function toolbar_get_rendered_subtrees() { $parameters->setRoot('system.admin')->excludeRoot()->setMaxDepth(3)->onlyEnabledLinks(); $tree = $menu_tree->load(NULL, $parameters); $manipulators = array( - array('callable' => 'menu.default_tree_manipulators:checkNodeAccess'), - array('callable' => 'menu.default_tree_manipulators:loadEntities'), array('callable' => 'menu.default_tree_manipulators:checkAccess'), array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'), array('callable' => 'toolbar_menu_navigation_links'),