Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Classes/Listener/RecordSummaryForLocalization.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
use TYPO3\CMS\Core\Attribute\AsEventListener;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Utility\GeneralUtility;

#[AsEventListener(identifier: 'tx-container-record-summary-for-localization')]
class RecordSummaryForLocalization
Expand Down Expand Up @@ -96,6 +98,7 @@ protected function resolveRecordColPos(array $record, $localizeRecords): int
protected function fetchOneRecord(int $uid): ?array
{
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tt_content');
$queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(DeletedRestriction::class));
$row = $queryBuilder->select('*')
->from('tt_content')
->where(
Expand All @@ -112,6 +115,7 @@ protected function fetchOneRecord(int $uid): ?array
protected function fetchAllRecords(array $uids): array
{
$queryBuilder = $this->connectionPool->getQueryBuilderForTable('tt_content');
$queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(DeletedRestriction::class));
$rows = $queryBuilder->select('*')
->from('tt_content')
->where(
Expand Down
7 changes: 7 additions & 0 deletions Tests/Functional/Listener/Fixtures/hidden_element.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
"tt_content"
,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","hidden"
,"41","1","header","hidden element","256","0","0","0","0","1"
"pages"
,"uid","pid","sys_language_uid","l10n_parent"
,"1","0","0","0"
,"2","0","1","1"
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
"tt_content"
,"uid","pid","CType","header","sorting","sys_language_uid","colPos","tx_container_parent","l18n_parent","hidden"
,"5","1","b13-2cols-with-header-container","Hidden Container","256","0","0","0","0","1"
,"4","1","header","Child Of Hidden Container","288","0","200","5","0","0"
,"38","1","b13-2cols-with-header-container","Translated Hidden Container","256","1","0","0","5","0"
"pages"
,"uid","pid","sys_language_uid","l10n_parent"
,"1","0","0","0"
,"2","0","1","1"
52 changes: 51 additions & 1 deletion Tests/Functional/Listener/RecordSummaryForLocalization.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class RecordSummaryForLocalization extends FunctionalTestCase
public function childrenIsMovedIntoBackendLayoutColPosIfContainerIsAlreadyTranslated(): void
{
if ((new Typo3Version())->getMajorVersion() < 14) {
self::markTestSkipped('tested by RecordLocalizeSummaryModifierTest Unit Test');
self::markTestSkipped('only >= v14 related');
}
$records = [
0 => [
Expand All @@ -55,6 +55,56 @@ public function childrenIsMovedIntoBackendLayoutColPosIfContainerIsAlreadyTransl
self::assertSame($expected, $records);
}

#[Test]
public function childOfHiddenContainerIsKeptInSummaryWhenContainerIsHiddenAndAlreadyTranslated(): void
{
if ((new Typo3Version())->getMajorVersion() < 14) {
self::markTestSkipped('only >= v14 related');
}
$records = [
200 => [
0 => ['uid' => 4, 'title' => 'Child Of Hidden Container'],
],
];
$columns = [0 => 'Normal'];
$event = new AfterRecordSummaryForLocalizationEvent($records, $columns);
$this->importCSVDataSet(__DIR__ . '/Fixtures/localize_container_child_in_hidden_container.csv');
$listener = $this->getContainer()->get(\B13\Container\Listener\RecordSummaryForLocalization::class);
$listener($event);
$records = $event->getRecords();
$expected = [
0 => [
0 => ['uid' => 4, 'title' => 'Child Of Hidden Container'],
],
];
self::assertSame($expected, $records);
}

#[Test]
public function hiddenElementThatShouldBeLocalizedIsKeptInSummary(): void
{
if ((new Typo3Version())->getMajorVersion() < 14) {
self::markTestSkipped('tested by RecordLocalizeSummaryModifierTest Unit Test');
}
$records = [
0 => [
0 => ['uid' => 41, 'title' => 'hidden element'],
],
];
$columns = [0 => 'Normal'];
$event = new AfterRecordSummaryForLocalizationEvent($records, $columns);
$this->importCSVDataSet(__DIR__ . '/Fixtures/hidden_element.csv');
$listener = $this->getContainer()->get(\B13\Container\Listener\RecordSummaryForLocalization::class);
$listener($event);
$records = $event->getRecords();
$expected = [
0 => [
0 => ['uid' => 41, 'title' => 'hidden element'],
],
];
self::assertSame($expected, $records);
}

#[Test]
public function childrenIsNotMovedIntoBackendLayoutColPosIfContainerShouldBeTranslated(): void
{
Expand Down