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

Issue #3048698 by Sam152, alexpott, tedbow, fenstrat: Content moderation layout builder integration fails when a node has an associated menu item

merge-requests/1119/head
Alex Pott 2019-04-23 16:26:50 +01:00
parent 11228d4be9
commit e07c22588a
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/content_moderation/tests/src/Functional/LayoutBuilderContentModerationIntegrationTest.php
View File

@ -23,6 +23,7 @@ class LayoutBuilderContentModerationIntegrationTest extends BrowserTestBase {
'layout_builder',
'node',
'content_moderation',
'menu_ui',
];
/**
@ -76,6 +77,12 @@ class LayoutBuilderContentModerationIntegrationTest extends BrowserTestBase {
],
],
]);
_menu_ui_node_save($node, [
'title' => 'bar',
'menu_name' => 'main',
'description' => 'view bar',
'parent' => '',
]);
$this->drupalGet($node->toUrl());
// Publish the node. Revision count: 2.

8
core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php
View File

@ -16,9 +16,15 @@ class MenuSettingsConstraintValidator extends ConstraintValidator {
public function validate($entity, Constraint $constraint) {
if (isset($entity) && !$entity->isNew() && !$entity->isDefaultRevision()) {
$defaults = menu_ui_get_menu_link_defaults($entity);
$values = $entity->menu;
$violation_path = NULL;
// If the menu UI entity builder is not present and the menu property has
// not been set, do not attempt to validate the menu settings since they
// are not being modified.
if (!$values = $entity->menu) {
return;
}
if (trim($values['title']) && !empty($values['menu_parent'])) {
list($menu_name, $parent) = explode(':', $values['menu_parent'], 2);
$values['menu_name'] = $menu_name;