diff --git a/src/Routing/PageManagerRoutes.php b/src/Routing/PageManagerRoutes.php index 1d16f1d..3a2a434 100644 --- a/src/Routing/PageManagerRoutes.php +++ b/src/Routing/PageManagerRoutes.php @@ -81,6 +81,7 @@ protected function alterRoutes(RouteCollection $collection) { $path = $entity->getPath(); } + $first = TRUE; foreach ($entity->getVariants() as $variant_id => $variant) { // Construct and add a new route. $route = new Route( @@ -100,7 +101,8 @@ protected function alterRoutes(RouteCollection $collection) { '_admin_route' => $entity->usesAdminTheme(), ] ); - $collection->add($route_name . '_' . $variant_id, $route); + $collection->add($first ? $route_name : $route_name . '_' . $variant_id, $route); + $first = FALSE; } } } diff --git a/tests/src/Unit/PageManagerRoutesTest.php b/tests/src/Unit/PageManagerRoutesTest.php index 528f4cb..39d5b14 100644 --- a/tests/src/Unit/PageManagerRoutesTest.php +++ b/tests/src/Unit/PageManagerRoutesTest.php @@ -146,14 +146,13 @@ public function testAlterRoutesWithStatus() { // Only the valid page should be in the collection. $this->assertSame(1, $collection->count()); - $route_name = 'page_manager.page_view_page1'; - $route = $collection->get($route_name . '_variant1'); + $route = $collection->get('page_manager.page_view_page1'); $expected_defaults = [ '_entity_view' => 'page_manager_page', 'page_manager_page' => 'page1', '_title' => 'Page label', 'variant_id' => 'variant1', - 'base_route_name' => $route_name, + 'base_route_name' => 'page_manager.page_view_page1', ]; $expected_requirements = [ '_entity_access' => 'page_manager_page.view', @@ -207,9 +206,10 @@ public function testAlterRoutesOverrideExisting($page_path, $existing_route_path // The normal route name is not used, the existing route name is instead. $this->assertSame(1, $collection->count()); + $this->assertNull($collection->get('page_manager.page_view_page1')); $this->assertNull($collection->get('page_manager.page_view_page1_variant1')); - $route = $collection->get($route_name . '_variant1'); + $route = $collection->get($route_name); $expected_defaults = [ '_entity_view' => 'page_manager_page', 'page_manager_page' => 'page1',