From e3833d0f4928e1193ebd3f3b9aa6f462541d43b3 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 4 Aug 2014 12:07:26 +0100
Subject: [PATCH] Issue #2312925 by olli, kim.pepper, dawehner: Fixed 'Add
Link' button adds a new menu instead.
---
core/modules/menu_ui/menu_ui.module | 3 ++-
core/modules/menu_ui/src/MenuListBuilder.php | 2 +-
core/modules/menu_ui/src/Tests/MenuTest.php | 4 ++++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 8dbb4e2c1cdd..efe5d0fb5c67 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -75,7 +75,8 @@ function menu_ui_entity_type_build(array &$entity_types) {
->setListBuilderClass('Drupal\menu_ui\MenuListBuilder')
->setLinkTemplate('add-form', 'menu_ui.menu_add')
->setLinkTemplate('delete-form', 'menu_ui.delete_menu')
- ->setLinkTemplate('edit-form', 'menu_ui.menu_edit');
+ ->setLinkTemplate('edit-form', 'menu_ui.menu_edit')
+ ->setLinkTemplate('add-link-form', 'menu_link_content.link_add');
}
diff --git a/core/modules/menu_ui/src/MenuListBuilder.php b/core/modules/menu_ui/src/MenuListBuilder.php
index 0c6615d88dc4..4fdb29841c8c 100644
--- a/core/modules/menu_ui/src/MenuListBuilder.php
+++ b/core/modules/menu_ui/src/MenuListBuilder.php
@@ -54,7 +54,7 @@ public function getDefaultOperations(EntityInterface $entity) {
$operations['add'] = array(
'title' => t('Add link'),
'weight' => 20,
- ) + $entity->urlInfo('add-form')->toArray();
+ ) + $entity->urlInfo('add-link-form')->toArray();
}
if (isset($operations['delete'])) {
$operations['delete']['title'] = t('Delete menu');
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index ce7fd57b7096..cf92af2f13b2 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -249,6 +249,10 @@ function doMenuTests() {
),
));
+ // Verify add link button.
+ $this->drupalGet('admin/structure/menu');
+ $this->assertLinkByHref('admin/structure/menu/manage/' . $menu_name . '/add', 0, "The add menu link button url is correct");
+
// Add menu links.
$item1 = $this->addMenuLink('', 'node/' . $node1->id(), $menu_name, TRUE);
$item2 = $this->addMenuLink($item1->getPluginId(), 'node/' . $node2->id(), $menu_name, FALSE);
--
GitLab