summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorNathaniel Catchpole2019-01-18 08:54:09 (GMT)
committerNathaniel Catchpole2019-01-18 08:54:35 (GMT)
commitde323cd29b24d9b865fb7173e6a5e68f9275430f (patch)
tree19096b36402ae501c637237ec392fdbcc3a62010 /core
parent5525e51d1a38b5483918627c2acdd2999c98a6f3 (diff)
Issue #3003238 by Sam152, amateescu, Berdir: EntityStorageException: Default revision can not be deleted in content_moderation_entity_revision_delete()
(cherry picked from commit 2492cdda1c440c51dd1b9a1d4439fa33b80cda99)
Diffstat (limited to 'core')
-rw-r--r--core/modules/content_moderation/src/EntityOperations.php9
-rw-r--r--core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php24
2 files changed, 29 insertions, 4 deletions
diff --git a/core/modules/content_moderation/src/EntityOperations.php b/core/modules/content_moderation/src/EntityOperations.php
index 8c6d332..52d2ca3 100644
--- a/core/modules/content_moderation/src/EntityOperations.php
+++ b/core/modules/content_moderation/src/EntityOperations.php
@@ -235,10 +235,11 @@ class EntityOperations implements ContainerInjectionInterface {
* @see hook_entity_revision_delete()
*/
public function entityRevisionDelete(EntityInterface $entity) {
- /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
- if (!$entity->isDefaultRevision()) {
- $content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity);
- if ($content_moderation_state) {
+ if ($content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity)) {
+ if ($content_moderation_state->isDefaultRevision()) {
+ $content_moderation_state->delete();
+ }
+ else {
$this->entityTypeManager
->getStorage('content_moderation_state')
->deleteRevision($content_moderation_state->getRevisionId());
diff --git a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
index 4b7d75b..a1c3832 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
@@ -239,6 +239,30 @@ class ContentModerationStateTest extends KernelTestBase {
}
/**
+ * Tests removal of content moderation state entities for preexisting content.
+ */
+ public function testExistingContentModerationStateDataRemoval() {
+ $storage = $this->entityTypeManager->getStorage('entity_test_mulrevpub');
+
+ $entity = $storage->create([]);
+ $entity->save();
+ $original_revision_id = $entity->getRevisionId();
+
+ $workflow = $this->createEditorialWorkflow();
+ $workflow->getTypePlugin()->addEntityTypeAndBundle($entity->getEntityTypeId(), $entity->bundle());
+ $workflow->save();
+
+ $entity->moderation_state = 'draft';
+ $entity->save();
+
+ $storage->deleteRevision($entity->getRevisionId());
+
+ $entity = $this->reloadEntity($entity);
+ $this->assertEquals('published', $entity->moderation_state->value);
+ $this->assertEquals($original_revision_id, $storage->getLatestRevisionId($entity->id()));
+ }
+
+ /**
* Tests removal of content moderation state translations.
*
* @dataProvider basicModerationTestCases