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

Issue #3012172 by acbramley: EntityViewBuilder::addContextualLinks assumes an entity's canonical rel is routed/internal 

(cherry picked from commit caa4845430)
merge-requests/803/head
catch 2021-06-11 11:40:57 +01:00
parent ae21ac5cf8
commit af362ba8a6
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Entity/EntityViewBuilder.php
View File

@ -362,7 +362,7 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
$rel = 'revision'; $rel = 'revision';
$key .= '_revision'; $key .= '_revision';
} }
if ($entity->hasLinkTemplate($rel)) { if ($entity->hasLinkTemplate($rel) && $entity->toUrl($rel)->isRouted()) {
$build['#contextual_links'][$key] = [ $build['#contextual_links'][$key] = [
'route_parameters' => $entity->toUrl($rel)->getRouteParameters(), 'route_parameters' => $entity->toUrl($rel)->getRouteParameters(),
]; ];

14
core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
View File

@ -343,4 +343,18 @@ class EntityViewBuilderTest extends EntityKernelTestBase {
$this->assertArrayNotHasKey('#theme', $build); $this->assertArrayNotHasKey('#theme', $build);
} }
/**
* Tests an entity type with an external canonical rel.
*/
public function testExternalEntity() {
$this->installEntitySchema('entity_test_external');
/** @var \Drupal\Core\Render\RendererInterface $renderer */
$renderer = $this->container->get('renderer');
$entity_test = $this->createTestEntity('entity_test_external');
$entity_test->save();
$view = $this->container->get('entity_type.manager')->getViewBuilder('entity_test_external')->view($entity_test);
$renderer->renderRoot($view);
$this->assertArrayNotHasKey('#contextual_links', $view);
}
} }