Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Issue #3003238 by Sam152, amateescu, Berdir: EntityStorageException: Default revision can not be deleted in content_moderation_entity_revision_delete()" 

This reverts commit 2492cdda1c.
8.7.x
Nathaniel Catchpole 2019-01-18 11:07:43 +00:00
parent 898083ce7b
commit c59f10b928
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/modules/content_moderation/src/EntityOperations.php
View File

@ -235,11 +235,10 @@ class EntityOperations implements ContainerInjectionInterface {
* @see hook_entity_revision_delete()
*/
public function entityRevisionDelete(EntityInterface $entity) {
if ($content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity)) {
if ($content_moderation_state->isDefaultRevision()) {
$content_moderation_state->delete();
}
else {
/** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
if (!$entity->isDefaultRevision()) {
$content_moderation_state = ContentModerationStateEntity::loadFromModeratedEntity($entity);
if ($content_moderation_state) {
$this->entityTypeManager
->getStorage('content_moderation_state')
->deleteRevision($content_moderation_state->getRevisionId());

24
core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
View File

@ -238,30 +238,6 @@ class ContentModerationStateTest extends KernelTestBase {
$this->assertFalse($content_moderation_state);
}
/**
* 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.
*