Skip to content

Fix the entity revision revert and delete buttons on the revisions tab #4295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the entity revision revert and delete buttons on the revisions tab #4295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions templates/module/src/Entity/Form/entity-content-revision-delete.php.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class {{ entity_class }}RevisionDeleteForm extends ConfirmFormBase {% endblock %
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, ${{ entity_name }}_revision = NULL) {
$this->revision = $this->{{ entity_class }}Storage->loadRevision(${{ entity_name }}_revision);
$this->revision = $this->{{ entity_class[:1]|lower ~ entity_class[1:] }}Storage->loadRevision(${{ entity_name }}_revision);
$form = parent::buildForm($form, $form_state);

return $form;
Expand All @@ -98,15 +98,15 @@ class {{ entity_class }}RevisionDeleteForm extends ConfirmFormBase {% endblock %
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
$this->{{ entity_class }}Storage->deleteRevision($this->revision->getRevisionId());
$this->{{ entity_class[:1]|lower ~ entity_class[1:] }}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()]));
$form_state->setRedirect(
'entity.{{ entity_name }}.canonical',
['{{ entity_name }}' => $this->revision->id()]
);
if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {{ '{'~entity_name~'_field_revision}' }} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {{ '{'~entity_name }}{% if is_translatable %}_field{% endif %}{{ '_revision}' }} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
$form_state->setRedirect(
'entity.{{ entity_name }}.version_history',
['{{ entity_name }}' => $this->revision->id()]
Expand Down
2 changes: 1 addition & 1 deletion templates/module/src/Entity/Form/entity-content-revision-revert.php.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class {{ entity_class }}RevisionRevertForm extends ConfirmFormBase {% endblock %
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, ${{ entity_name }}_revision = NULL) {
$this->revision = $this->{{ entity_class }}Storage->loadRevision(${{ entity_name }}_revision);
$this->revision = $this->{{ entity_class[:1]|lower ~ entity_class[1:] }}Storage->loadRevision(${{ entity_name }}_revision);
$form = parent::buildForm($form, $form_state);

return $form;
Expand Down