Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2951548 by finne, idebr: Restore Menu Link parent references when deleting nested links

merge-requests/1654/head
Alex Pott 2018-04-02 21:57:30 +02:00
parent 5d5af494fb
commit 2cdab9c011
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/modules/menu_link_content/src/Entity/MenuLinkContent.php
View File

@ -235,6 +235,14 @@ class MenuLinkContent extends ContentEntityBase implements MenuLinkContentInterf
foreach ($entities as $menu_link) {
/** @var \Drupal\menu_link_content\Entity\MenuLinkContent $menu_link */
$menu_link_manager->removeDefinition($menu_link->getPluginId(), FALSE);
// Children get re-attached to the menu link's parent.
$parent_plugin_id = $menu_link->getParentId();
$children = $storage->loadByProperties(['parent' => $menu_link->getPluginId()]);
foreach ($children as $child) {
/** @var \Drupal\menu_link_content\Entity\MenuLinkContent $child */
$child->set('parent', $parent_plugin_id)->save();
}
}
}

62
core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeleteTest.php Normal file
View File

@ -0,0 +1,62 @@
<?php
namespace Drupal\Tests\menu_link_content\Kernel;
use Drupal\menu_link_content\Entity\MenuLinkContent;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests the menu link content delete function.
*
* @group menu_link_content
*/
class MenuLinkContentDeleteTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
public static $modules = ['menu_link_content', 'link', 'system'];
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
$this->installEntitySchema('menu_link_content');
}
/**
* Tests the MenuLinkContent::preDelete function.
*/
public function testMenuLinkContentDelete() {
// Add new menu items in a hierarchy.
$parent = MenuLinkContent::create([
'title' => $this->randomMachineName(8),
'link' => [['uri' => 'internal:/']],
'menu_name' => 'main',
]);
$parent->save();
$child1 = MenuLinkContent::create([
'title' => $this->randomMachineName(8),
'link' => [['uri' => 'internal:/']],
'menu_name' => 'main',
'parent' => 'menu_link_content:' . $parent->uuid(),
]);
$child1->save();
$child2 = MenuLinkContent::create([
'title' => $this->randomMachineName(8),
'link' => [['uri' => 'internal:/']],
'menu_name' => 'main',
'parent' => 'menu_link_content:' . $child1->uuid(),
]);
$child2->save();
// Delete the middle child.
$child1->delete();
// Refresh $child2.
$child2 = MenuLinkContent::load($child2->id());
// Test the reference in the child.
$this->assertSame('menu_link_content:' . $parent->uuid(), $child2->getParentId());
}
}