From 5578437d348eb0d536aae858bec7899d7b42154a Mon Sep 17 00:00:00 2001 From: DavorHorvacki <42215392+Holo96@users.noreply.github.com> Date: Mon, 16 Dec 2019 10:51:50 +0100 Subject: [PATCH 1/3] Update entity-controller.php.twig --- templates/module/src/Controller/entity-controller.php.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/module/src/Controller/entity-controller.php.twig b/templates/module/src/Controller/entity-controller.php.twig index e948bf932..f213c97ee 100644 --- a/templates/module/src/Controller/entity-controller.php.twig +++ b/templates/module/src/Controller/entity-controller.php.twig @@ -12,6 +12,7 @@ namespace Drupal\{{ module }}\Controller; use Drupal\Component\Utility\Xss; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; +use Drupal\Core\Link; use Drupal\Core\Url; use Drupal\{{ module }}\Entity\{{ entity_class }}Interface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -132,13 +133,13 @@ class {{ entity_class }}Controller extends ControllerBase implements ContainerIn // Use revision link to link to revisions that are not active. $date = $this->dateFormatter->format($revision->getRevisionCreationTime(), 'short'); if ($vid != ${{ entity_name }}->getRevisionId()) { - $link = $this->l($date, new Url('entity.{{ entity_name }}.revision', [ + $link = Link::fromTextAndUrl($date, new Url('entity.{{ entity_name }}.revision', [ '{{ entity_name }}' => ${{ entity_name }}->id(), '{{ entity_name }}_revision' => $vid, ])); } else { - $link = ${{ entity_name }}->link($date); + $link = ${{ entity_name }}->toLink($date)->toString(); } $row = []; From f77325d20e45711b0d47afe01108846f3e1a3361 Mon Sep 17 00:00:00 2001 From: DavorHorvacki <42215392+Holo96@users.noreply.github.com> Date: Mon, 16 Dec 2019 10:56:49 +0100 Subject: [PATCH 2/3] Update entity-content-revision-delete.php.twig --- .../Form/entity-content-revision-delete.php.twig | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/templates/module/src/Entity/Form/entity-content-revision-delete.php.twig b/templates/module/src/Entity/Form/entity-content-revision-delete.php.twig index 20352b2dc..7bc952634 100644 --- a/templates/module/src/Entity/Form/entity-content-revision-delete.php.twig +++ b/templates/module/src/Entity/Form/entity-content-revision-delete.php.twig @@ -23,6 +23,14 @@ use Symfony\Component\DependencyInjection\ContainerInterface; */ class {{ entity_class }}RevisionDeleteForm extends ConfirmFormBase {% endblock %} {% block class_methods %} + + /** + * The date formatter. + * + * @var \Drupal\Core\Datetime\DateFormatterInterface + */ + protected $dateFormatter; + /** * The {{ label }} revision. * @@ -49,6 +57,7 @@ class {{ entity_class }}RevisionDeleteForm extends ConfirmFormBase {% endblock % */ public static function create(ContainerInterface $container) { $instance = parent::create($container); + $instance->dateFormatter = $container->get('date.formatter'); $instance->{{ entity_class[:1]|lower ~ entity_class[1:] }}Storage = $container->get('entity_type.manager')->getStorage('{{ entity_name }}'); $instance->connection = $container->get('database'); return $instance; @@ -66,7 +75,7 @@ class {{ entity_class }}RevisionDeleteForm extends ConfirmFormBase {% endblock % */ public function getQuestion() { return $this->t('Are you sure you want to delete the revision from %revision-date?', [ - '%revision-date' => format_date($this->revision->getRevisionCreationTime()), + '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()), ]); } @@ -101,7 +110,7 @@ class {{ entity_class }}RevisionDeleteForm extends ConfirmFormBase {% endblock % $this->{{ entity_class }}Storage->deleteRevision($this->revision->getRevisionId()); $this->logger('content')->notice('{{ label }}: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]); - $this->messenger()->addMessage(t('Revision from %revision-date of {{ label }} %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()])); + $this->messenger()->addMessage(t('Revision from %revision-date of {{ label }} %title has been deleted.', ['%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()])); $form_state->setRedirect( 'entity.{{ entity_name }}.canonical', ['{{ entity_name }}' => $this->revision->id()] From ec16689a7a16967183bdd2f9f798d0620559e82e Mon Sep 17 00:00:00 2001 From: DavorHorvacki <42215392+Holo96@users.noreply.github.com> Date: Mon, 16 Dec 2019 10:59:29 +0100 Subject: [PATCH 3/3] Update entity-content-revision-revert.php.twig --- .../Form/entity-content-revision-revert.php.twig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/module/src/Entity/Form/entity-content-revision-revert.php.twig b/templates/module/src/Entity/Form/entity-content-revision-revert.php.twig index 53ceef0b8..bec5adf64 100644 --- a/templates/module/src/Entity/Form/entity-content-revision-revert.php.twig +++ b/templates/module/src/Entity/Form/entity-content-revision-revert.php.twig @@ -44,6 +44,13 @@ class {{ entity_class }}RevisionRevertForm extends ConfirmFormBase {% endblock % * @var \Drupal\Core\Datetime\DateFormatterInterface */ protected $dateFormatter; + + /** + * The time service. + * + * @var \Drupal\Component\Datetime\TimeInterface + */ + protected $time; /** * {@inheritdoc} @@ -52,6 +59,7 @@ class {{ entity_class }}RevisionRevertForm extends ConfirmFormBase {% endblock % $instance = parent::create($container); $instance->{{ entity_class[:1]|lower ~ entity_class[1:] }}Storage = $container->get('entity_type.manager')->getStorage('{{ entity_name }}'); $instance->dateFormatter = $container->get('date.formatter'); + $instance->time = $container->get('datetime.time'); return $instance; } @@ -138,7 +146,7 @@ class {{ entity_class }}RevisionRevertForm extends ConfirmFormBase {% endblock % protected function prepareRevertedRevision({{ entity_class }}Interface $revision, FormStateInterface $form_state) { $revision->setNewRevision(); $revision->isDefaultRevision(TRUE); - $revision->setRevisionCreationTime(REQUEST_TIME); + $revision->setRevisionCreationTime($this->time->getRequestTime()); return $revision; }