diff --git a/core/modules/content_moderation/src/Plugin/views/ModerationStateJoinViewsHandlerTrait.php b/core/modules/content_moderation/src/Plugin/views/ModerationStateJoinViewsHandlerTrait.php index 3affab6acd6054c1c2f285c45c6c6aac9f33913c..bf49573db06a421312e5130a13121422ea6d6a21 100644 --- a/core/modules/content_moderation/src/Plugin/views/ModerationStateJoinViewsHandlerTrait.php +++ b/core/modules/content_moderation/src/Plugin/views/ModerationStateJoinViewsHandlerTrait.php @@ -35,6 +35,10 @@ public function ensureMyTable() { 'field' => 'content_entity_type_id', 'value' => $left_entity_type->id(), ], + [ + 'field' => 'content_entity_id', + 'left_field' => $left_entity_type->getKey('id'), + ], ], ]; if ($left_entity_type->isTranslatable()) { diff --git a/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php b/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php index a8ade5fa396f2f14557e9737ffd42841b8993960..4341998b781d572bd0ce39b0d5039fb638ba365a 100644 --- a/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php +++ b/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php @@ -297,8 +297,11 @@ protected function assertNodesWithFilters(array $nodes, array $filters, $view_id $this->assertEquals('vid', $configuration['left_field']); $this->assertEquals('content_entity_type_id', $configuration['extra'][0]['field']); $this->assertEquals('node', $configuration['extra'][0]['value']); - $this->assertEquals('langcode', $configuration['extra'][1]['field']); - $this->assertEquals('langcode', $configuration['extra'][1]['left_field']); + + $this->assertEquals('content_entity_id', $configuration['extra'][1]['field']); + $this->assertEquals('nid', $configuration['extra'][1]['left_field']); + $this->assertEquals('langcode', $configuration['extra'][2]['field']); + $this->assertEquals('langcode', $configuration['extra'][2]['left_field']); $expected_result = []; foreach ($nodes as $node) {