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

Issue #2942497 by scott_euser, timmillwood, malcomio, Berdir: Using content moderation block in preview mode causes EntityStorageException

8.6.x
Alex Pott 2018-02-12 10:57:12 +00:00
parent 3840ad24dc
commit b6890803c1
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,6 +269,9 @@ class EntityOperations implements ContainerInjectionInterface {
if (!$this->moderationInfo->isModeratedEntity($entity)) { if (!$this->moderationInfo->isModeratedEntity($entity)) {
return; return;
} }
if (isset($entity->in_preview) && $entity->in_preview) {
return;
}
// If the component is not defined for this display, we have nothing to do. // If the component is not defined for this display, we have nothing to do.
if (!$display->getComponent('content_moderation_control')) { if (!$display->getComponent('content_moderation_control')) {
return; return;

16
core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
View File

@ -4,6 +4,7 @@ namespace Drupal\Tests\content_moderation\Functional;
use Drupal\Core\Entity\Entity\EntityFormDisplay; use Drupal\Core\Entity\Entity\EntityFormDisplay;
use Drupal\workflows\Entity\Workflow; use Drupal\workflows\Entity\Workflow;
use Drupal\Core\Url;
/** /**
* Tests the moderation form, specifically on nodes. * Tests the moderation form, specifically on nodes.
@ -80,6 +81,21 @@ class ModerationFormTest extends ModerationStateTestBase {
$this->assertResponse(200); $this->assertResponse(200);
$this->assertField('edit-new-state', 'The node view page has a moderation form.'); $this->assertField('edit-new-state', 'The node view page has a moderation form.');
// Preview the draft.
$this->drupalPostForm($edit_path, [
'body[0][value]' => 'Second version of the content.',
'moderation_state[0][state]' => 'draft',
], t('Preview'));
// The preview view should not have a moderation form.
$preview_url = Url::fromRoute('entity.node.preview', [
'node_preview' => $node->uuid(),
'view_mode_id' => 'full',
]);
$this->assertResponse(200);
$this->assertUrl($preview_url);
$this->assertNoField('edit-new-state', 'The node preview page has no moderation form.');
// The latest version page should not show, because there is still no // The latest version page should not show, because there is still no
// pending revision. // pending revision.
$this->drupalGet($latest_version_path); $this->drupalGet($latest_version_path);