Skip to content

[TASK] Allow stdWrap on MM SOLR_RELATION cObject #3409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
b3nkai wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −4
Open

[TASK] Allow stdWrap on MM SOLR_RELATION cObject #3409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 11 additions & 4 deletions Classes/ContentObject/Relation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ protected function getRelatedItems(ContentObjectRenderer $parentContentObject):
$fieldTCA = $this->tcaService->getConfigurationForField($table, $field);

if (isset($fieldTCA['config']['MM']) && trim($fieldTCA['config']['MM']) !== '') {
$relatedItems = $this->getRelatedItemsFromMMTable($table, $overlayUid, $fieldTCA);
$relatedItems = $this->getRelatedItemsFromMMTable($table, $overlayUid, $fieldTCA, $parentContentObject);
} else {
$relatedItems = $this->getRelatedItemsFromForeignTable($table, $overlayUid, $fieldTCA, $parentContentObject);
}
Expand All @@ -169,8 +169,12 @@ protected function getRelatedItems(ContentObjectRenderer $parentContentObject):
* @throws AspectNotFoundException
* @throws DBALException
*/
protected function getRelatedItemsFromMMTable(string $localTableName, int $localRecordUid, array $localFieldTca): array
{
protected function getRelatedItemsFromMMTable(
string $localTableName,
int $localRecordUid,
array $localFieldTca,
ContentObjectRenderer $parentContentObject
): array {
$relatedItems = [];
$foreignTableName = $localFieldTca['config']['foreign_table'];
$foreignTableTca = $this->tcaService->getTableConfiguration($foreignTableName);
Expand All @@ -192,6 +196,7 @@ protected function getRelatedItemsFromMMTable(string $localTableName, int $local
}

$relatedRecords = $this->getRelatedRecords($foreignTableName, ...$selectUids);
$backupData = $parentContentObject->data;
foreach ($relatedRecords as $record) {
if (isset($foreignTableTca['columns'][$foreignTableLabelField]['config']['foreign_table'])
&& !empty($this->configuration['enableRecursiveValueResolution'])
Expand All @@ -212,8 +217,10 @@ protected function getRelatedItemsFromMMTable(string $localTableName, int $local
if ($this->getLanguageUid() > 0) {
$record = $this->frontendOverlayService->getOverlay($foreignTableName, $record);
}
$relatedItems[] = $record[$foreignTableLabelField];
$parentContentObject->data = $record;
$relatedItems[] = $parentContentObject->stdWrap($record[$foreignTableLabelField], $this->configuration);
}
$parentContentObject->data = $backupData;

return $relatedItems;
}
Expand Down