From abfa491664670a83f0c71eebfe63047635612288 Mon Sep 17 00:00:00 2001
From: Sascha Grossenbacher <saschagros@gmail.com>
Date: Wed, 16 Mar 2016 21:48:23 +0100
Subject: [PATCH] Fixes for RevisionBasicUITest
---
src/Controller/RevisionOverviewController.php | 15 +++++++++++++--
src/Form/RevisionRevertForm.php | 2 +-
tests/src/Kernel/RevisionBasicUITest.php | 1 +
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/Controller/RevisionOverviewController.php b/src/Controller/RevisionOverviewController.php
index 7dd0c9d..c92410e 100644
--- a/src/Controller/RevisionOverviewController.php
+++ b/src/Controller/RevisionOverviewController.php
@@ -13,6 +13,7 @@ use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Datetime\DateFormatterInterface;
use Drupal\Core\Entity\ContentEntityInterface;
use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Render\RendererInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Entity\RevisionLogInterface;
use Drupal\user\EntityOwnerInterface;
@@ -35,21 +36,29 @@ class RevisionOverviewController extends ControllerBase {
*/
protected $dateFormatter;
+ /**
+ * The renderer.
+ *
+ * @var \Drupal\Core\Render\RendererInterface
+ */
+ protected $renderer;
+
/**
* Creates a new RevisionOverviewController instance.
*
* @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
* The date formatter.
*/
- public function __construct(DateFormatterInterface $date_formatter) {
+ public function __construct(DateFormatterInterface $date_formatter, RendererInterface $renderer) {
$this->dateFormatter = $date_formatter;
+ $this->renderer = $renderer;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
- return new static($container->get('date.formatter'));
+ return new static($container->get('date.formatter'), $container->get('renderer'));
}
/**
@@ -106,10 +115,12 @@ class RevisionOverviewController extends ControllerBase {
$date = $this->dateFormatter->format($revision->getRevisionCreationTime(), 'short');
$link = $revision->toLink($date, 'revision');
+ // @todo: Simplify this when https://www.drupal.org/node/2334319 lands.
$username = [
'#theme' => 'username',
'#account' => $revision->getRevisionUser(),
];
+ $username = $this->renderer->render($username);
}
else {
$link = $revision->toLink($revision->label(), 'revision');
diff --git a/src/Form/RevisionRevertForm.php b/src/Form/RevisionRevertForm.php
index 926a100..a238dab 100644
--- a/src/Form/RevisionRevertForm.php
+++ b/src/Form/RevisionRevertForm.php
@@ -74,7 +74,7 @@ class RevisionRevertForm extends ConfirmFormBase {
*/
public function getQuestion() {
if ($this->revision instanceof RevisionLogInterface) {
- return $this->t('Are you sure you want to revert to the revision from %revision-date?', ['%revision-date' => $this->dateFormatter->format($this->revision->getRevisionLogMessage())]);
+ return $this->t('Are you sure you want to revert to the revision from %revision-date?', ['%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime())]);
}
return $this->t('Are you sure you want to revert the revision?');
}
diff --git a/tests/src/Kernel/RevisionBasicUITest.php b/tests/src/Kernel/RevisionBasicUITest.php
index 5cb7649..f452efc 100644
--- a/tests/src/Kernel/RevisionBasicUITest.php
+++ b/tests/src/Kernel/RevisionBasicUITest.php
@@ -33,6 +33,7 @@ class RevisionBasicUITest extends KernelTestBase {
$this->installEntitySchema('user');
$this->installEntitySchema('entity_test_enhanced');
$this->installSchema('system', 'router');
+ $this->installConfig(['system']);
$bundle = EnhancedEntityBundle::create([
'id' => 'default',
--
GitLab