diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php index 9ce148f..79db9ee 100644 --- a/core/modules/views/src/Plugin/views/display/Page.php +++ b/core/modules/views/src/Plugin/views/display/Page.php @@ -132,7 +132,8 @@ protected function defineOptions() { 'title' => array('default' => ''), 'description' => array('default' => ''), 'weight' => array('default' => 0), - 'enabled' => array('default' => 1), + 'enabled' => array('default' => FALSE), + 'expanded' => array('default' => FALSE), 'menu_name' => array('default' => 'main'), 'parent' => array('default' => ''), 'context' => array('default' => ''), diff --git a/core/modules/views/src/Plugin/views/display/PathPluginBase.php b/core/modules/views/src/Plugin/views/display/PathPluginBase.php index c9a8440..6ab63fd 100644 --- a/core/modules/views/src/Plugin/views/display/PathPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/PathPluginBase.php @@ -325,9 +325,7 @@ public function getMenuLinks() { $links[$menu_link_id]['description'] = $menu['description']; $links[$menu_link_id]['parent'] = $menu['parent']; $links[$menu_link_id]['enabled'] = $menu['enabled']; - if (isset($menu['expanded'])) { - $links[$menu_link_id]['expanded'] = $menu['expanded']; - } + $links[$menu_link_id]['expanded'] = $menu['expanded']; if (isset($menu['weight'])) { $links[$menu_link_id]['weight'] = intval($menu['weight']); diff --git a/core/modules/views/src/Tests/ViewsMenuLinkTest.php b/core/modules/views/src/Tests/ViewsMenuLinkTest.php index 4da964c..1c9822a 100644 --- a/core/modules/views/src/Tests/ViewsMenuLinkTest.php +++ b/core/modules/views/src/Tests/ViewsMenuLinkTest.php @@ -47,6 +47,9 @@ class ViewsMenuLinkTest extends ViewTestBase { */ protected $menuLinkOverrides; + /** + * {@inheritdoc} + */ protected function setUp() { parent::setUp(); @@ -55,12 +58,13 @@ protected function setUp() { $this->menuLinkOverrides = $this->container->get('menu_link.static.overrides'); } + /** + * Test views internal menu link options. + */ public function testMenuLinkOverrides() { - /** - * Link from views module. - */ + // Link from views module. $views_link = $this->menuLinkManager->getDefinition('views_view:views.test_page_display_menu.page_3'); - $this->assertTrue($views_link['enabled'], 'Menu link is enabled.'); + $this->assertFalse($views_link['enabled'], 'Menu link is not enabled.'); $this->assertFalse($views_link['expanded'], 'Menu link is not expanded.'); $views_link['enabled'] = 0; $views_link['expanded'] = 1; @@ -72,9 +76,7 @@ public function testMenuLinkOverrides() { $this->assertFalse($views_link['enabled'], 'Menu link is disabled.'); $this->assertTrue($views_link['expanded'], 'Menu link is expanded.'); - /** - * Link from user module. - */ + // Link from user module. $user_link = $this->menuLinkManager->getDefinition('user.page'); $this->assertTrue($user_link['enabled'], 'Menu link is enabled.'); $user_link['enabled'] = 0;