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
15 changes: 13 additions & 2 deletions Classes/Xclasses/RecordLocalizeSummaryModifier.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use B13\Container\Tca\Registry;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;

Expand Down Expand Up @@ -101,7 +103,7 @@ protected function getContainerUids(array $uids): array
if (empty($containerCTypes)) {
return [];
}
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tt_content');
$queryBuilder = $this->getQueryBuilder();
return (array)$queryBuilder->select('uid')
->from('tt_content')
->where(
Expand All @@ -121,7 +123,7 @@ protected function getContainerUids(array $uids): array
protected function getContainerChildren(array $uids): array
{
$containerChildren = [];
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tt_content');
$queryBuilder = $this->getQueryBuilder();
$stm = $queryBuilder->select('*')
->from('tt_content')
->where(
Expand All @@ -140,4 +142,13 @@ protected function getContainerChildren(array $uids): array
}
return $containerChildren;
}

protected function getQueryBuilder(): QueryBuilder
{
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tt_content');
$queryBuilder->getRestrictions()
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class));
return $queryBuilder;
}
}
9 changes: 9 additions & 0 deletions Tests/Functional/Xclasses/Fixtures/hidden_child_record.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<dataset>
<tt_content>
<uid>1</uid>
<CType>header</CType>
<tx_container_parent>2</tx_container_parent>
<hidden>1</hidden>
</tt_content>
</dataset>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<dataset>
<tt_content>
<uid>1</uid>
<CType>b13-2cols-with-header-container</CType>
<hidden>1</hidden>
</tt_content>
</dataset>
29 changes: 29 additions & 0 deletions Tests/Functional/Xclasses/RecordLocalizeSummaryModifierTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,33 @@ public function getContainerUidsReturnsAllUids(): void
$containerUids = $recordLocalizeSummeryModifier->_call('getContainerUids', [1, 2]);
self::assertSame(2, count($containerUids));
}

/**
* @test
*/
public function getContainerChildrenReturnsHiddenRecords(): void
{
$this->importDataSet(ORIGINAL_ROOT . 'typo3conf/ext/container/Tests/Functional/Xclasses/Fixtures/hidden_child_record.xml');
$recordLocalizeSummeryModifier = $this->getAccessibleMock(
RecordLocalizeSummaryModifier::class,
['foo']
);
$containerChildren = $recordLocalizeSummeryModifier->_call('getContainerChildren', [1]);
self::assertTrue(isset($containerChildren[1]));
self::assertIsArray($containerChildren[1]);
}

/**
* @test
*/
public function getContainerUidsReturnsHiddenUids(): void
{
$this->importDataSet(ORIGINAL_ROOT . 'typo3conf/ext/container/Tests/Functional/Xclasses/Fixtures/hidden_container_record.xml');
$recordLocalizeSummeryModifier = $this->getAccessibleMock(
RecordLocalizeSummaryModifier::class,
['foo']
);
$containerUids = $recordLocalizeSummeryModifier->_call('getContainerUids', [1]);
self::assertSame([1], $containerUids);
}
}