diff --git a/src/Controller/RevisionControllerTrait.php b/src/Controller/RevisionControllerTrait.php index 5c3319ccdff5b825bbca976cdb2a77932aa5b0f7..80adc1d20cebcbee6b9d680d5fdfabfb5ea0156a 100644 --- a/src/Controller/RevisionControllerTrait.php +++ b/src/Controller/RevisionControllerTrait.php @@ -155,7 +155,13 @@ trait RevisionControllerTrait { } } else { - $row[] = $this->getOperationLinks($revision); + $links = $this->getOperationLinks($revision); + $row[] = [ + 'data' => [ + '#type' => 'operations', + '#links' => $links, + ], + ]; } } diff --git a/src/Controller/RevisionOverviewController.php b/src/Controller/RevisionOverviewController.php index c92410ee19be63c32b6207adb0d3d1ef44a168da..b3f815d3486bfc5c0d3052938a39f6d2ce133a83 100644 --- a/src/Controller/RevisionOverviewController.php +++ b/src/Controller/RevisionOverviewController.php @@ -72,10 +72,10 @@ class RevisionOverviewController extends ControllerBase { * {@inheritdoc} */ protected function buildRevertRevisionLink(EntityInterface $entity_revision) { - if ($entity_revision->hasLinkTemplate('revision-revert')) { + if ($entity_revision->hasLinkTemplate('revision-revert-form')) { return [ 'title' => t('Revert'), - 'url' => $entity_revision->toUrl('revision-revert'), + 'url' => $entity_revision->toUrl('revision-revert-form'), ]; } } @@ -84,10 +84,10 @@ class RevisionOverviewController extends ControllerBase { * {@inheritdoc} */ protected function buildDeleteRevisionLink(EntityInterface $entity_revision) { - if ($entity_revision->hasLinkTemplate('revision-delete')) { + if ($entity_revision->hasLinkTemplate('revision-delete-form')) { return [ 'title' => t('Delete'), - 'url' => $entity_revision->toUrl('revision-delete'), + 'url' => $entity_revision->toUrl('revision-delete-form'), ]; } } diff --git a/tests/src/Kernel/RevisionBasicUITest.php b/tests/src/Kernel/RevisionBasicUITest.php index f452efc4e1efa3ea7d9e3c61676a2bb4aa15108e..741b5864c3f683f2f1b18316762e95872867b2d7 100644 --- a/tests/src/Kernel/RevisionBasicUITest.php +++ b/tests/src/Kernel/RevisionBasicUITest.php @@ -84,6 +84,20 @@ class RevisionBasicUITest extends KernelTestBase { // This ensures that the default revision is still the first revision. $this->assertTrue(strpos($response->getContent(), 'entity_test_enhanced/1/revisions/2/view') !== FALSE); $this->assertTrue(strpos($response->getContent(), 'entity_test_enhanced/1') !== FALSE); + + // Publish a new revision. + $revision = clone $entity; + $revision->name->value = 'rev 3'; + $revision->setNewRevision(TRUE); + $revision->isDefaultRevision(TRUE); + $revision->save(); + + $request = Request::create($revision->url('version-history')); + $response = $http_kernel->handle($request); + $this->assertEquals(200, $response->getStatusCode()); + + // The first revision row should now include a revert link. + $this->assertTrue(strpos($response->getContent(), 'entity_test_enhanced/1/revisions/1/revert') !== FALSE); } public function testRevisionView() {